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: Wed, 14 Jul 2021 04:53:28
Message-Id: 1626238377.2275340eb63f5f974ad11fb14040cdf7f89d0551.sam@gentoo
1 commit: 2275340eb63f5f974ad11fb14040cdf7f89d0551
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 14 04:51:06 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 14 04:52:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2275340e
7
8 dev-libs/libxml2: fix libcrypt QA warning false positive
9
10 Closes: https://bugs.gentoo.org/798942
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 dev-libs/libxml2/Manifest | 1 +
14 dev-libs/libxml2/libxml2-2.9.12-r4.ebuild | 254 ++++++++++++++++++++++++++++++
15 2 files changed, 255 insertions(+)
16
17 diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
18 index 92c97c365e0..282d68582d1 100644
19 --- a/dev-libs/libxml2/Manifest
20 +++ b/dev-libs/libxml2/Manifest
21 @@ -2,6 +2,7 @@ DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a
22 DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed
23 DIST libxml2-2.9.12-r2-patchset.tar.bz2 5939 BLAKE2B e518a174385a121ca5545d0a51c2a2b4ddd21b1e7996e2806f368588b27d60e8318ab50ebfb90c3ee57ccece4f1c37e05c1daeed4203a4e9cb5a056ba530ad2b SHA512 06b96ab8426cd560c1147998965b5e718bee08536549a278269f6535ff1460ed97d83067ed0e8a4d834145a5e5a6caa912cf8aa5a33a360e4b1bc9d9135bfb04
24 DIST libxml2-2.9.12-r3-patchset.tar.bz2 6281 BLAKE2B b7038f85009afdacc2fcf0b9cf30f915f20a2c8dfbe3749c6e74c637191f97169ee46b26deac5e347230d956f2d5aded218d09f0232f23b39ef4ad5e2fd09f61 SHA512 8170462eb3ecd2f834650309498a4e586fb3edb3114f42b3c95e96dc2ca81181e70ccd1790c440bd7ef4f489a2311b99765dcd12d9fb52207a11fb4394409ae8
25 +DIST libxml2-2.9.12-r4-patchset.tar.bz2 7006 BLAKE2B 64225a16346bff60f2bf3b6d32dffeec6887c44d308dd816d6de3b92ee7f7dd5599b5dfdae0b6ca9e056897c17b659ff36d170f972e1b6043ca3ec8de9c65050 SHA512 ca0734c894afc264851107c22a606b9094941a4452a946b769d6f7161b3301425da5bd3e26eeceb4e31e9721f76505aacf73eeaffa6699bb7395783915eff111
26 DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934 SHA512 df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd
27 DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf SHA512 69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656
28 DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d
29
30 diff --git a/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild
31 new file mode 100644
32 index 00000000000..975c32047f3
33 --- /dev/null
34 +++ b/dev-libs/libxml2/libxml2-2.9.12-r4.ebuild
35 @@ -0,0 +1,254 @@
36 +# Copyright 1999-2021 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +
41 +# Note: Please bump in sync with dev-libs/libxslt
42 +
43 +PATCHSET_VERSION="2.9.12-r4-patchset"
44 +
45 +PYTHON_COMPAT=( python3_{7,8,9} )
46 +PYTHON_REQ_USE="xml"
47 +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielveillard.asc
48 +inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig
49 +
50 +XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
51 +XSTS_NAME_1="xmlschema2002-01-16"
52 +XSTS_NAME_2="xmlschema2004-01-14"
53 +XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
54 +XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
55 +XMLCONF_TARBALL="xmlts20130923.tar.gz"
56 +DESCRIPTION="XML C parser and toolkit"
57 +HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"
58 +SRC_URI="
59 + ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz
60 + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2
61 + test? (
62 + ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
63 + ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2}
64 + https://www.w3.org/XML/Test/${XMLCONF_TARBALL}
65 + )
66 + verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc )
67 +"
68 +S="${WORKDIR}/${PN}-${PV%_rc*}"
69 +
70 +LICENSE="MIT"
71 +SLOT="2"
72 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
73 +IUSE="debug examples icu ipv6 lzma +python readline static-libs test"
74 +RESTRICT="!test? ( test )"
75 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
76 +
77 +BDEPEND="
78 + dev-util/gtk-doc-am
79 + virtual/pkgconfig
80 + verify-sig? ( app-crypt/openpgp-keys-danielveillard )
81 +"
82 +RDEPEND="
83 + >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
84 + icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
85 + lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] )
86 + python? ( ${PYTHON_DEPS} )
87 + readline? ( sys-libs/readline:= )
88 +"
89 +DEPEND="${RDEPEND}"
90 +
91 +MULTILIB_CHOST_TOOLS=(
92 + /usr/bin/xml2-config
93 +)
94 +
95 +DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS )
96 +
97 +PATCHES=(
98 + ## Gentoo
99 + # Patches needed for prefix support
100 + "${WORKDIR}"/${PN}-2.7.1-catalog_path.patch
101 +
102 + # Fix python detection, bug #567066
103 + # https://bugzilla.gnome.org/show_bug.cgi?id=760458
104 + "${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch
105 +
106 + # Fix python tests when building out of tree #565576
107 + "${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch
108 +
109 + # bug #745162
110 + "${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch
111 +
112 + # Avoid failure on missing fuzz.h when running tests
113 + "${WORKDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch
114 +
115 + # Respect LDFLAGS fully
116 + "${WORKDIR}"/${PN}-2.9.12-respect-LDFLAGS-as-needed.patch
117 +
118 + ## Upstream
119 + # Fix lxml compatibility (bug #790737)
120 + "${WORKDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch
121 + # Fix serialising empty HTML documents (bug #794733)
122 + "${WORKDIR}"/${PN}-2.9.12-Fix-whitespace-when-serializing-empty-HTML-documents.patch
123 +)
124 +
125 +src_unpack() {
126 + local tarname=${P/_rc/-rc}.tar.gz
127 +
128 + if use verify-sig ; then
129 + verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc}
130 + fi
131 +
132 + # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR},
133 + # as they are needed as tarballs in ${S}/xstc instead and not unpacked
134 + unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2
135 +
136 + cd "${S}" || die
137 +
138 + if use test ; then
139 + cp "${DISTDIR}/${XSTS_TARBALL_1}" \
140 + "${DISTDIR}/${XSTS_TARBALL_2}" \
141 + "${S}"/xstc/ \
142 + || die "Failed to install test tarballs"
143 + unpack ${XMLCONF_TARBALL}
144 + fi
145 +}
146 +
147 +src_prepare() {
148 + default
149 +
150 + eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c
151 +
152 + if [[ ${CHOST} == *-darwin* ]] ; then
153 + # Avoid final linking arguments for python modules
154 + sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die
155 + # gcc-apple doesn't grok -Wno-array-bounds
156 + sed -i -e 's/-Wno-array-bounds//' configure.ac || die
157 + fi
158 +
159 + # Please do not remove, as else we get references to PORTAGE_TMPDIR
160 + # in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
161 + # We now need to run eautoreconf at the end to prevent maintainer mode.
162 + #elibtoolize
163 + eautoreconf
164 +}
165 +
166 +multilib_src_configure() {
167 + # Filter seemingly problematic CFLAGS (#26320)
168 + filter-flags -fprefetch-loop-arrays -funroll-loops
169 +
170 + # Notes:
171 + # 1) USE zlib support breaks gnome2
172 + # (libgnomeprint for instance fails to compile with
173 + # fresh install, and existing) - <azarah@g.o> (22 Dec 2002).
174 + #
175 + # 2) The meaning of the 'debug' USE flag does not apply to the --with-debug
176 + # switch (enabling the libxml2 debug module). See bug #100898.
177 + #
178 + # 3) --with-mem-debug causes unusual segmentation faults (bug #105120).
179 +
180 + libxml2_configure() {
181 + ECONF_SOURCE="${S}" econf \
182 + --with-html-subdir=${PF}/html \
183 + $(use_with debug run-debug) \
184 + $(use_with icu) \
185 + $(use_with lzma) \
186 + $(use_enable ipv6) \
187 + $(use_enable static-libs static) \
188 + $(multilib_native_use_with readline) \
189 + $(multilib_native_use_with readline history) \
190 + "$@"
191 + }
192 +
193 + libxml2_py_configure() {
194 + # Ensure python build dirs exist
195 + mkdir -p "${BUILD_DIR}" || die
196 +
197 + # Odd build system, also see bug #582130
198 + run_in_build_dir libxml2_configure \
199 + "--with-python=${EPYTHON}" \
200 + "--with-python-install-dir=$(python_get_sitedir)"
201 + }
202 +
203 + # Build python bindings separately
204 + libxml2_configure --without-python
205 +
206 + if multilib_is_native_abi && use python ; then
207 + python_foreach_impl libxml2_py_configure
208 + fi
209 +}
210 +
211 +libxml2_py_emake() {
212 + pushd "${BUILD_DIR}/python" > /dev/null || die
213 +
214 + emake "$@"
215 +
216 + popd > /dev/null || die
217 +}
218 +
219 +multilib_src_compile() {
220 + default
221 +
222 + if multilib_is_native_abi && use python ; then
223 + local native_builddir="${BUILD_DIR}"
224 +
225 + python_foreach_impl libxml2_py_emake \
226 + top_builddir="${native_builddir}" \
227 + all
228 + fi
229 +}
230 +
231 +multilib_src_test() {
232 + ln -s "${S}"/xmlconf || die
233 +
234 + emake check
235 +
236 + if multilib_is_native_abi && use python ; then
237 + python_foreach_impl libxml2_py_emake test
238 + fi
239 +}
240 +
241 +multilib_src_install() {
242 + emake \
243 + DESTDIR="${D}" \
244 + EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \
245 + install
246 +
247 + if multilib_is_native_abi && use python ; then
248 + python_foreach_impl libxml2_py_emake \
249 + DESTDIR="${D}" \
250 + docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \
251 + exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \
252 + install
253 +
254 + python_foreach_impl python_optimize
255 + fi
256 +}
257 +
258 +multilib_src_install_all() {
259 + rm -rf "${ED}"/usr/share/doc/${P}
260 +
261 + einstalldocs
262 +
263 + if ! use examples ; then
264 + rm -rf "${ED}"/usr/share/doc/${PF}/examples
265 + rm -rf "${ED}"/usr/share/doc/${PF}/python/examples
266 + fi
267 +
268 + find "${D}" -name '*.la' -delete || die
269 +}
270 +
271 +pkg_postinst() {
272 + # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
273 + # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
274 + if [[ -n "${ROOT}" ]]; then
275 + elog "Skipping XML catalog creation for stage building (bug #208887)."
276 + else
277 + # Need an XML catalog, so no-one writes to a non-existent one
278 + CATALOG="${EROOT}/etc/xml/catalog"
279 +
280 + # We don't want to clobber an existing catalog though,
281 + # only ensure that one is there
282 + # <obz@g.o>
283 + if [[ ! -e "${CATALOG}" ]]; then
284 + [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml"
285 + "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}"
286 + einfo "Created XML catalog in ${CATALOG}"
287 + fi
288 + fi
289 +}