Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libxml2/
Date: Mon, 29 Aug 2022 15:36:15
Message-Id: 1661787361.daa57b36200f23b0a6faac384e73e3848e75618f.sam@gentoo
1 commit: daa57b36200f23b0a6faac384e73e3848e75618f
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 29 15:35:01 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 29 15:36:01 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daa57b36
7
8 dev-libs/libxml2: drop 2.10.0-r1, 2.10.1
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-libs/libxml2/Manifest | 2 -
13 dev-libs/libxml2/libxml2-2.10.0-r1.ebuild | 195 ------------------------------
14 dev-libs/libxml2/libxml2-2.10.1.ebuild | 195 ------------------------------
15 3 files changed, 392 deletions(-)
16
17 diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
18 index 967a834303b7..f5ac9a3f1639 100644
19 --- a/dev-libs/libxml2/Manifest
20 +++ b/dev-libs/libxml2/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST libxml2-2.10.0.tar.xz 2698684 BLAKE2B 655b9241db06b98f5d33f6d02f2dbf5f998ae9a125f2c16e4d8ce3ee902d53ec14e728e7f3de2aea47b45e825b9ed78f17caffd9e4e9afbde40e1d7b1e047e7f SHA512 0a7a58414c3a4f21e9b052cc18f18032bc646f2690483bb95e37e132a3fc5789f0ec7bbc91b58497df59dbccf0e52f6e6280947762f47a035e85a316e96b1623
23 -DIST libxml2-2.10.1.tar.xz 2697480 BLAKE2B a6297058b9a4f351dbf078a4cbcee2be0a30d3cae10fad53e8972b8ddff833b1612a25af8784be547aa6a3e7bafa126a3a23e5a7b3b75d17d4484af668eba4d0 SHA512 7ae653eef725706c825a8755da14a92124c3f85b38f81fd1148c6e373b149d095eae935a47d874d210dafc7e76f09c019866657b8f9d6a44c666ce741e12f3ce
24 DIST libxml2-2.10.2.tar.xz 2636304 BLAKE2B 3ccc11ac73a81ee7ea3e565597c95e74923eba3d858c9a915aecf1dcf2fb6ab3e46c6ed2ea504261a822de2ac2132834ffa8ffd039e9e1390a9637a2dac7d6c5 SHA512 c26ee428ae2fae2326fcaec156ed36c5f5d63aeb4839d626f6544a3fad158a1602e9dc0d542b2f947e6a8de0c09ff130da2626a30aec27446ce09614f78466b5
25 DIST libxml2-2.9.14-patches-r0.tar.bz2 8304 BLAKE2B 067faba5bfcbf81e2ef356925c0d3b4ef0aff7604db049366180b8217b781c60c2746be348c5e1a09de925e54fc69e3e431f7e2199ce326b6ff88ea9352ca45c SHA512 e97bada92a14ef0501a5f7be312d35d26eb52b648102d028dc11b3eef62ee0597540d0b474f54bd015a914a9cb7600d4dc34912b0ead5230136e945d80ae8428
26 DIST libxml2-2.9.14.tar.xz 3129968 BLAKE2B ab584503d5209e4aaf41ae6f44aed5e94c0ae29e28cfba39a9012568aa97515af861b47891b84d2a352a07357626ba50ddb1e344e911fa14ff2ce93c5beff1f1 SHA512 d08e6cafb289c499fdc5b3a12181e032a34f7a249bc66758859f964d3e71e19fd69be79921e1a9d8ab1e692d15b13f5fae95eeb10c3236974d89e218f5107606
27
28 diff --git a/dev-libs/libxml2/libxml2-2.10.0-r1.ebuild b/dev-libs/libxml2/libxml2-2.10.0-r1.ebuild
29 deleted file mode 100644
30 index 713da438e12c..000000000000
31 --- a/dev-libs/libxml2/libxml2-2.10.0-r1.ebuild
32 +++ /dev/null
33 @@ -1,195 +0,0 @@
34 -# Copyright 1999-2022 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=8
38 -
39 -# Note: Please bump in sync with dev-libs/libxslt
40 -
41 -PYTHON_COMPAT=( python3_{8..11} )
42 -PYTHON_REQ_USE="xml(+)"
43 -inherit autotools flag-o-matic python-r1 multilib-minimal
44 -
45 -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
46 -XSTS_NAME_1="xmlschema2002-01-16"
47 -XSTS_NAME_2="xmlschema2004-01-14"
48 -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
49 -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
50 -XMLCONF_TARBALL="xmlts20130923.tar.gz"
51 -
52 -DESCRIPTION="XML C parser and toolkit"
53 -HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
54 -if [[ ${PV} == 9999 ]] ; then
55 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
56 - inherit git-r3 #autotools
57 -else
58 - inherit gnome.org #libtool
59 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
60 -fi
61 -
62 -SRC_URI+="
63 - test? (
64 - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
65 - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
66 - https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
67 - )"
68 -S="${WORKDIR}/${PN}-${PV%_rc*}"
69 -
70 -LICENSE="MIT"
71 -SLOT="2"
72 -IUSE="debug examples +ftp icu lzma +python readline static-libs test"
73 -RESTRICT="!test? ( test )"
74 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
75 -
76 -RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
77 - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
78 - lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
79 - python? ( ${PYTHON_DEPS} )
80 - readline? ( sys-libs/readline:= )"
81 -DEPEND="${RDEPEND}"
82 -BDEPEND="virtual/pkgconfig"
83 -
84 -if [[ ${PV} == 9999 ]] ; then
85 - BDEPEND+=" dev-util/gtk-doc-am"
86 -fi
87 -
88 -MULTILIB_CHOST_TOOLS=(
89 - /usr/bin/xml2-config
90 -)
91 -
92 -DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
93 -
94 -src_unpack() {
95 - if [[ ${PV} == 9999 ]] ; then
96 - git-r3_src_unpack
97 - else
98 - local tarname=${P/_rc/-rc}.tar.xz
99 -
100 - # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
101 - # as they are needed as tarballs in ${S}/xstc instead and not unpacked
102 - unpack ${tarname}
103 -
104 - if [[ -n ${PATCHSET_VERSION} ]] ; then
105 - unpack ${PN}-${PATCHSET_VERSION}.tar.bz2
106 - fi
107 - fi
108 -
109 - cd "${S}" || die
110 -
111 - if use test ; then
112 - cp "${DISTDIR}/${XSTS_TARBALL_1}" \
113 - "${DISTDIR}/${XSTS_TARBALL_2}" \
114 - "${S}"/xstc/ \
115 - || die "Failed to install test tarballs"
116 - unpack ${XMLCONF_TARBALL}
117 - fi
118 -}
119 -
120 -src_prepare() {
121 - default
122 -
123 - if [[ ${PV} == 9999 ]] ; then
124 - eautoreconf
125 - else
126 - # Please do not remove, as else we get references to PORTAGE_TMPDIR
127 - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
128 - #elibtoolize
129 -
130 - # Temporarily for Python 3.10 fix (version used for
131 - # dist tarballs fails w/ "3.1" error)
132 - # See https://gitlab.gnome.org/GNOME/libxml2/-/issues/392.
133 - eautoreconf
134 - fi
135 -}
136 -
137 -multilib_src_configure() {
138 - # Filter seemingly problematic CFLAGS (bug #26320)
139 - filter-flags -fprefetch-loop-arrays -funroll-loops
140 -
141 - # Notes:
142 - # The meaning of the 'debug' USE flag does not apply to the --with-debug
143 - # switch (enabling the libxml2 debug module). See bug #100898.
144 - libxml2_configure() {
145 - ECONF_SOURCE="${S}" econf \
146 - --enable-ipv6 \
147 - $(use_with ftp) \
148 - $(use_with debug run-debug) \
149 - $(use_with icu) \
150 - $(use_with lzma) \
151 - $(use_enable static-libs static) \
152 - $(multilib_native_use_with readline) \
153 - $(multilib_native_use_with readline history) \
154 - "$@"
155 - }
156 -
157 - # Build python bindings separately
158 - libxml2_configure --without-python
159 -
160 - multilib_is_native_abi && use python &&
161 - python_foreach_impl run_in_build_dir libxml2_configure --with-python
162 -}
163 -
164 -libxml2_py_emake() {
165 - pushd "${BUILD_DIR}"/python >/dev/null || die
166 -
167 - emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
168 -
169 - popd >/dev/null || die
170 -}
171 -
172 -multilib_src_compile() {
173 - default
174 -
175 - if multilib_is_native_abi && use python ; then
176 - NATIVE_BUILD_DIR="${BUILD_DIR}"
177 - python_foreach_impl run_in_build_dir libxml2_py_emake all
178 - fi
179 -}
180 -
181 -multilib_src_test() {
182 - ln -s "${S}"/xmlconf || die
183 -
184 - emake check
185 -
186 - multilib_is_native_abi && use python &&
187 - python_foreach_impl run_in_build_dir libxml2_py_emake check
188 -}
189 -
190 -multilib_src_install() {
191 - emake DESTDIR="${D}" install
192 -
193 - multilib_is_native_abi && use python &&
194 - python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
195 -}
196 -
197 -multilib_src_install_all() {
198 - einstalldocs
199 -
200 - if ! use examples ; then
201 - rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
202 - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
203 - fi
204 -
205 - rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
206 -
207 - find "${ED}" -name '*.la' -delete || die
208 -}
209 -
210 -pkg_postinst() {
211 - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
212 - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
213 - if [[ -n "${ROOT}" ]]; then
214 - elog "Skipping XML catalog creation for stage building (bug #208887)."
215 - else
216 - # Need an XML catalog, so no-one writes to a non-existent one
217 - CATALOG="${EROOT}/etc/xml/catalog"
218 -
219 - # We don't want to clobber an existing catalog though,
220 - # only ensure that one is there
221 - # <obz@g.o>
222 - if [[ ! -e "${CATALOG}" ]]; then
223 - [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
224 - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
225 - einfo "Created XML catalog in ${CATALOG}"
226 - fi
227 - fi
228 -}
229
230 diff --git a/dev-libs/libxml2/libxml2-2.10.1.ebuild b/dev-libs/libxml2/libxml2-2.10.1.ebuild
231 deleted file mode 100644
232 index 713da438e12c..000000000000
233 --- a/dev-libs/libxml2/libxml2-2.10.1.ebuild
234 +++ /dev/null
235 @@ -1,195 +0,0 @@
236 -# Copyright 1999-2022 Gentoo Authors
237 -# Distributed under the terms of the GNU General Public License v2
238 -
239 -EAPI=8
240 -
241 -# Note: Please bump in sync with dev-libs/libxslt
242 -
243 -PYTHON_COMPAT=( python3_{8..11} )
244 -PYTHON_REQ_USE="xml(+)"
245 -inherit autotools flag-o-matic python-r1 multilib-minimal
246 -
247 -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
248 -XSTS_NAME_1="xmlschema2002-01-16"
249 -XSTS_NAME_2="xmlschema2004-01-14"
250 -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
251 -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
252 -XMLCONF_TARBALL="xmlts20130923.tar.gz"
253 -
254 -DESCRIPTION="XML C parser and toolkit"
255 -HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
256 -if [[ ${PV} == 9999 ]] ; then
257 - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"
258 - inherit git-r3 #autotools
259 -else
260 - inherit gnome.org #libtool
261 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
262 -fi
263 -
264 -SRC_URI+="
265 - test? (
266 - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
267 - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
268 - https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
269 - )"
270 -S="${WORKDIR}/${PN}-${PV%_rc*}"
271 -
272 -LICENSE="MIT"
273 -SLOT="2"
274 -IUSE="debug examples +ftp icu lzma +python readline static-libs test"
275 -RESTRICT="!test? ( test )"
276 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
277 -
278 -RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
279 - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
280 - lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
281 - python? ( ${PYTHON_DEPS} )
282 - readline? ( sys-libs/readline:= )"
283 -DEPEND="${RDEPEND}"
284 -BDEPEND="virtual/pkgconfig"
285 -
286 -if [[ ${PV} == 9999 ]] ; then
287 - BDEPEND+=" dev-util/gtk-doc-am"
288 -fi
289 -
290 -MULTILIB_CHOST_TOOLS=(
291 - /usr/bin/xml2-config
292 -)
293 -
294 -DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO )
295 -
296 -src_unpack() {
297 - if [[ ${PV} == 9999 ]] ; then
298 - git-r3_src_unpack
299 - else
300 - local tarname=${P/_rc/-rc}.tar.xz
301 -
302 - # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
303 - # as they are needed as tarballs in ${S}/xstc instead and not unpacked
304 - unpack ${tarname}
305 -
306 - if [[ -n ${PATCHSET_VERSION} ]] ; then
307 - unpack ${PN}-${PATCHSET_VERSION}.tar.bz2
308 - fi
309 - fi
310 -
311 - cd "${S}" || die
312 -
313 - if use test ; then
314 - cp "${DISTDIR}/${XSTS_TARBALL_1}" \
315 - "${DISTDIR}/${XSTS_TARBALL_2}" \
316 - "${S}"/xstc/ \
317 - || die "Failed to install test tarballs"
318 - unpack ${XMLCONF_TARBALL}
319 - fi
320 -}
321 -
322 -src_prepare() {
323 - default
324 -
325 - if [[ ${PV} == 9999 ]] ; then
326 - eautoreconf
327 - else
328 - # Please do not remove, as else we get references to PORTAGE_TMPDIR
329 - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
330 - #elibtoolize
331 -
332 - # Temporarily for Python 3.10 fix (version used for
333 - # dist tarballs fails w/ "3.1" error)
334 - # See https://gitlab.gnome.org/GNOME/libxml2/-/issues/392.
335 - eautoreconf
336 - fi
337 -}
338 -
339 -multilib_src_configure() {
340 - # Filter seemingly problematic CFLAGS (bug #26320)
341 - filter-flags -fprefetch-loop-arrays -funroll-loops
342 -
343 - # Notes:
344 - # The meaning of the 'debug' USE flag does not apply to the --with-debug
345 - # switch (enabling the libxml2 debug module). See bug #100898.
346 - libxml2_configure() {
347 - ECONF_SOURCE="${S}" econf \
348 - --enable-ipv6 \
349 - $(use_with ftp) \
350 - $(use_with debug run-debug) \
351 - $(use_with icu) \
352 - $(use_with lzma) \
353 - $(use_enable static-libs static) \
354 - $(multilib_native_use_with readline) \
355 - $(multilib_native_use_with readline history) \
356 - "$@"
357 - }
358 -
359 - # Build python bindings separately
360 - libxml2_configure --without-python
361 -
362 - multilib_is_native_abi && use python &&
363 - python_foreach_impl run_in_build_dir libxml2_configure --with-python
364 -}
365 -
366 -libxml2_py_emake() {
367 - pushd "${BUILD_DIR}"/python >/dev/null || die
368 -
369 - emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
370 -
371 - popd >/dev/null || die
372 -}
373 -
374 -multilib_src_compile() {
375 - default
376 -
377 - if multilib_is_native_abi && use python ; then
378 - NATIVE_BUILD_DIR="${BUILD_DIR}"
379 - python_foreach_impl run_in_build_dir libxml2_py_emake all
380 - fi
381 -}
382 -
383 -multilib_src_test() {
384 - ln -s "${S}"/xmlconf || die
385 -
386 - emake check
387 -
388 - multilib_is_native_abi && use python &&
389 - python_foreach_impl run_in_build_dir libxml2_py_emake check
390 -}
391 -
392 -multilib_src_install() {
393 - emake DESTDIR="${D}" install
394 -
395 - multilib_is_native_abi && use python &&
396 - python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
397 -}
398 -
399 -multilib_src_install_all() {
400 - einstalldocs
401 -
402 - if ! use examples ; then
403 - rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
404 - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
405 - fi
406 -
407 - rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
408 -
409 - find "${ED}" -name '*.la' -delete || die
410 -}
411 -
412 -pkg_postinst() {
413 - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
414 - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
415 - if [[ -n "${ROOT}" ]]; then
416 - elog "Skipping XML catalog creation for stage building (bug #208887)."
417 - else
418 - # Need an XML catalog, so no-one writes to a non-existent one
419 - CATALOG="${EROOT}/etc/xml/catalog"
420 -
421 - # We don't want to clobber an existing catalog though,
422 - # only ensure that one is there
423 - # <obz@g.o>
424 - if [[ ! -e "${CATALOG}" ]]; then
425 - [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
426 - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
427 - einfo "Created XML catalog in ${CATALOG}"
428 - fi
429 - fi
430 -}