Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/icu/
Date: Wed, 20 Jan 2021 19:32:31
Message-Id: 1611171119.372d3cc50b556b021ccd4ba60ce27be2adaa26cc.asturm@gentoo
1 commit: 372d3cc50b556b021ccd4ba60ce27be2adaa26cc
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 20 18:59:19 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 20 19:31:59 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=372d3cc5
7
8 dev-libs/icu: Security cleanup of 67.1 and 68.1
9
10 Package-Manager: Portage-3.0.14, Repoman-3.0.2
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 dev-libs/icu/Manifest | 2 -
14 dev-libs/icu/icu-67.1.ebuild | 141 ------------------------------------------
15 dev-libs/icu/icu-68.1.ebuild | 142 -------------------------------------------
16 3 files changed, 285 deletions(-)
17
18 diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
19 index 4838621448e..7051b66f002 100644
20 --- a/dev-libs/icu/Manifest
21 +++ b/dev-libs/icu/Manifest
22 @@ -1,3 +1 @@
23 -DIST icu4c-67_1-src.tgz 24518055 BLAKE2B f8a263b5c3e5e8ffea88a3bb766cb265aac026b5f9b2f45a1f06076f99f9f0dc3a4512487652d774ccfc8dc65f8f4c40a974e0aa2aa4381ee0c9885f6b871779 SHA512 4779f1ce1ca7976f6fad6768853ea8c540da54d11509e3b6cfd864a04b5f2db1c3d4b546387f91ad02fb90804525bc37d2543173f0d705d6ca11dc6f2b7640a8
24 -DIST icu4c-68_1-src.tgz 24722348 BLAKE2B 252ef254cba1a953a0defabae5bf06ba24b3cf48ae18fc4984b883d9f83a3a57129a0e782c85578cf69e9f397a8d6d3b16b70c3802084617d39ade68154f98f5 SHA512 24ff4ce5947c41fc12a168e15d4037556562c7f32c1da0bbedd705232476174a3b2318955a7124426a63c2034eb9ae077e728a5dbada8b9433d7173cac3db307
25 DIST icu4c-68_2-src.tgz 24737478 BLAKE2B ff54f903aed1a16928656e5f4fee79e4301038a70ba1d389fb2a2cc7c7dc4c76bc2430c810cea484c0ef69fbafc5728e71776c39874a5395c9dd06d573e8ea90 SHA512 24f3b7981667b37df58118f56ae76a09b719358c1efa8d6f044d28ef8df1c722a894957acadfb3c37aee39ac845893924fc3370d6bbe09875aec8d937059f84b
26
27 diff --git a/dev-libs/icu/icu-67.1.ebuild b/dev-libs/icu/icu-67.1.ebuild
28 deleted file mode 100644
29 index 82238a8b671..00000000000
30 --- a/dev-libs/icu/icu-67.1.ebuild
31 +++ /dev/null
32 @@ -1,141 +0,0 @@
33 -# Copyright 1999-2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -PYTHON_COMPAT=( python3_{6,7,8} )
39 -inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
40 -
41 -DESCRIPTION="International Components for Unicode"
42 -HOMEPAGE="http://site.icu-project.org/"
43 -SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
44 -
45 -LICENSE="BSD"
46 -
47 -SLOT="0/${PV}"
48 -
49 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
50 -IUSE="debug doc examples static-libs"
51 -
52 -BDEPEND="${PYTHON_DEPS}
53 - virtual/pkgconfig
54 - doc? ( app-doc/doxygen[dot] )
55 -"
56 -
57 -S="${WORKDIR}/${PN}/source"
58 -
59 -MULTILIB_CHOST_TOOLS=(
60 - /usr/bin/icu-config
61 -)
62 -
63 -PATCHES=(
64 - "${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
65 - "${FILESDIR}/${PN}-64.2-darwin.patch"
66 -)
67 -
68 -src_prepare() {
69 - default
70 -
71 - local variable
72 -
73 - # Disable renaming as it is stupid thing to do
74 - sed -i \
75 - -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
76 - common/unicode/uconfig.h || die
77 -
78 - # Fix linking of icudata
79 - sed -i \
80 - -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
81 - config/mh-linux || die
82 -
83 - # Append doxygen configuration to configure
84 - sed -i \
85 - -e 's:icudefs.mk:icudefs.mk Doxyfile:' \
86 - configure.ac || die
87 -
88 - eautoreconf
89 -}
90 -
91 -src_configure() {
92 - append-cxxflags -std=c++14
93 -
94 - if tc-is-cross-compiler; then
95 - mkdir "${WORKDIR}"/host || die
96 - pushd "${WORKDIR}"/host >/dev/null || die
97 -
98 - CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
99 - CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
100 - RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
101 - "${S}"/configure --disable-renaming --disable-debug \
102 - --disable-samples --enable-static || die
103 - emake
104 -
105 - popd >/dev/null || die
106 - fi
107 -
108 - multilib-minimal_src_configure
109 -}
110 -
111 -multilib_src_configure() {
112 - local myeconfargs=(
113 - --disable-renaming
114 - --disable-samples
115 - --disable-layoutex
116 - $(use_enable debug)
117 - $(use_enable static-libs static)
118 - $(multilib_native_use_enable examples samples)
119 - )
120 -
121 - tc-is-cross-compiler && myeconfargs+=(
122 - --with-cross-build="${WORKDIR}"/host
123 - )
124 -
125 - # icu tries to use clang by default
126 - tc-export CC CXX
127 -
128 - # make sure we configure with the same shell as we run icu-config
129 - # with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
130 - export CONFIG_SHELL="${EPREFIX}/bin/sh"
131 - # probably have no /bin/sh in prefix-chain
132 - [[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
133 -
134 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
135 -}
136 -
137 -multilib_src_compile() {
138 - default
139 -
140 - if multilib_is_native_abi && use doc; then
141 - doxygen -u Doxyfile || die
142 - doxygen Doxyfile || die
143 - fi
144 -}
145 -
146 -multilib_src_test() {
147 - # INTLTEST_OPTS: intltest options
148 - # -e: Exhaustive testing
149 - # -l: Reporting of memory leaks
150 - # -v: Increased verbosity
151 - # IOTEST_OPTS: iotest options
152 - # -e: Exhaustive testing
153 - # -v: Increased verbosity
154 - # CINTLTST_OPTS: cintltst options
155 - # -e: Exhaustive testing
156 - # -v: Increased verbosity
157 - emake -j1 VERBOSE="1" check
158 -}
159 -
160 -multilib_src_install() {
161 - default
162 -
163 - if multilib_is_native_abi && use doc; then
164 - docinto html
165 - dodoc -r doc/html/*
166 - fi
167 -}
168 -
169 -multilib_src_install_all() {
170 - einstalldocs
171 - docinto html
172 - dodoc ../readme.html
173 -}
174
175 diff --git a/dev-libs/icu/icu-68.1.ebuild b/dev-libs/icu/icu-68.1.ebuild
176 deleted file mode 100644
177 index eb3e9df49f3..00000000000
178 --- a/dev-libs/icu/icu-68.1.ebuild
179 +++ /dev/null
180 @@ -1,142 +0,0 @@
181 -# Copyright 1999-2021 Gentoo Authors
182 -# Distributed under the terms of the GNU General Public License v2
183 -
184 -EAPI=7
185 -
186 -PYTHON_COMPAT=( python3_{6,7,8} )
187 -inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
188 -
189 -DESCRIPTION="International Components for Unicode"
190 -HOMEPAGE="http://site.icu-project.org/"
191 -SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
192 -
193 -LICENSE="BSD"
194 -
195 -SLOT="0/${PV}"
196 -
197 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
198 -IUSE="debug doc examples static-libs"
199 -
200 -BDEPEND="${PYTHON_DEPS}
201 - virtual/pkgconfig
202 - doc? ( app-doc/doxygen[dot] )
203 -"
204 -
205 -S="${WORKDIR}/${PN}/source"
206 -
207 -MULTILIB_CHOST_TOOLS=(
208 - /usr/bin/icu-config
209 -)
210 -
211 -PATCHES=(
212 - "${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
213 - "${FILESDIR}/${PN}-64.2-darwin.patch"
214 - "${FILESDIR}/${PN}-68.1-nonunicode.patch"
215 -)
216 -
217 -src_prepare() {
218 - default
219 -
220 - local variable
221 -
222 - # Disable renaming as it is stupid thing to do
223 - sed -i \
224 - -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
225 - common/unicode/uconfig.h || die
226 -
227 - # Fix linking of icudata
228 - sed -i \
229 - -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
230 - config/mh-linux || die
231 -
232 - # Append doxygen configuration to configure
233 - sed -i \
234 - -e 's:icudefs.mk:icudefs.mk Doxyfile:' \
235 - configure.ac || die
236 -
237 - eautoreconf
238 -}
239 -
240 -src_configure() {
241 - append-cxxflags -std=c++14
242 -
243 - if tc-is-cross-compiler; then
244 - mkdir "${WORKDIR}"/host || die
245 - pushd "${WORKDIR}"/host >/dev/null || die
246 -
247 - CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
248 - CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
249 - RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
250 - "${S}"/configure --disable-renaming --disable-debug \
251 - --disable-samples --enable-static || die
252 - emake
253 -
254 - popd >/dev/null || die
255 - fi
256 -
257 - multilib-minimal_src_configure
258 -}
259 -
260 -multilib_src_configure() {
261 - local myeconfargs=(
262 - --disable-renaming
263 - --disable-samples
264 - --disable-layoutex
265 - $(use_enable debug)
266 - $(use_enable static-libs static)
267 - $(multilib_native_use_enable examples samples)
268 - )
269 -
270 - tc-is-cross-compiler && myeconfargs+=(
271 - --with-cross-build="${WORKDIR}"/host
272 - )
273 -
274 - # icu tries to use clang by default
275 - tc-export CC CXX
276 -
277 - # make sure we configure with the same shell as we run icu-config
278 - # with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
279 - export CONFIG_SHELL="${EPREFIX}/bin/sh"
280 - # probably have no /bin/sh in prefix-chain
281 - [[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
282 -
283 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
284 -}
285 -
286 -multilib_src_compile() {
287 - default
288 -
289 - if multilib_is_native_abi && use doc; then
290 - doxygen -u Doxyfile || die
291 - doxygen Doxyfile || die
292 - fi
293 -}
294 -
295 -multilib_src_test() {
296 - # INTLTEST_OPTS: intltest options
297 - # -e: Exhaustive testing
298 - # -l: Reporting of memory leaks
299 - # -v: Increased verbosity
300 - # IOTEST_OPTS: iotest options
301 - # -e: Exhaustive testing
302 - # -v: Increased verbosity
303 - # CINTLTST_OPTS: cintltst options
304 - # -e: Exhaustive testing
305 - # -v: Increased verbosity
306 - emake -j1 VERBOSE="1" check
307 -}
308 -
309 -multilib_src_install() {
310 - default
311 -
312 - if multilib_is_native_abi && use doc; then
313 - docinto html
314 - dodoc -r doc/html/*
315 - fi
316 -}
317 -
318 -multilib_src_install_all() {
319 - einstalldocs
320 - docinto html
321 - dodoc ../readme.html
322 -}