1 |
commit: f016ee441ef5590db02e09198fcbf6b12a463c50 |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 30 22:37:29 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 30 22:38:56 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f016ee44 |
7 |
|
8 |
dev-libs/libxml2: Drop old versions |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
dev-libs/libxml2/Manifest | 3 - |
13 |
.../files/2.9.9-python3-unicode-errors.patch | 34 --- |
14 |
dev-libs/libxml2/libxml2-2.9.10-r2.ebuild | 224 -------------------- |
15 |
dev-libs/libxml2/libxml2-2.9.9-r4.ebuild | 227 --------------------- |
16 |
4 files changed, 488 deletions(-) |
17 |
|
18 |
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest |
19 |
index ee77f61e855..9ded83cf33f 100644 |
20 |
--- a/dev-libs/libxml2/Manifest |
21 |
+++ b/dev-libs/libxml2/Manifest |
22 |
@@ -1,8 +1,5 @@ |
23 |
-DIST libxml2-2.9.10-patchset.tar.xz 71584 BLAKE2B 4925a28570ed4f84da0407c3ce5b257d0959661855792160e4c534125fe0bbfa3749e7fc43b6c91a17206ac08a85922f4158bf40164c8a17ec940bf12b7dde1c SHA512 cd5a6aa86b6cf9ff852922ecfa23f34edeecab10a0e6d1bcd4dca56a6e17713b10af9387c7a6276bfec612f1d44fc06c16a7bdcab01ef9080f4dd10fab253b93 |
24 |
DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede SHA512 a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952 |
25 |
DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed |
26 |
-DIST libxml2-2.9.9-patchset.tar.xz 16792 BLAKE2B f761b5cda41d57543dadf2cdd8915b69727a818f31badc1092903a9e4341b807852fed0887e9ec7a06a0c19c4a49f9afc2f3c048947f21a09006bb51ef8399ef SHA512 c8c0ee6d0a2833e5664aa7549999f8ba63b9f0bbfda4651050eeee7d3a958c33ef55daba8cfb1ca73ebffeb44d411b5f4259fe6e11ef0204ad2deebd1708ebfb |
27 |
-DIST libxml2-2.9.9.tar.gz 5476717 BLAKE2B 00a67c38084f2effd5d68d7d3e68f0c96cf4f52eab6d8d9b96dc91f03a84baa132abeaf303a836ff9bbf04f832432a036077316c464398e433c9779d8519074b SHA512 cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa6789e854685974eed95b362049dbf6c8e7357e0327d64c681ed390534ac154e6810 |
28 |
DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d |
29 |
DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 |
30 |
DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe |
31 |
|
32 |
diff --git a/dev-libs/libxml2/files/2.9.9-python3-unicode-errors.patch b/dev-libs/libxml2/files/2.9.9-python3-unicode-errors.patch |
33 |
deleted file mode 100644 |
34 |
index e87dcdedf88..00000000000 |
35 |
--- a/dev-libs/libxml2/files/2.9.9-python3-unicode-errors.patch |
36 |
+++ /dev/null |
37 |
@@ -1,34 +0,0 @@ |
38 |
-Index: libxml2-2.9.5/python/libxml.c |
39 |
-=================================================================== |
40 |
---- libxml2-2.9.5.orig/python/libxml.c |
41 |
-+++ libxml2-2.9.5/python/libxml.c |
42 |
-@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU |
43 |
- PyObject *message; |
44 |
- PyObject *result; |
45 |
- char str[1000]; |
46 |
-+ unsigned char *ptr = (unsigned char *)str; |
47 |
- |
48 |
- #ifdef DEBUG_ERROR |
49 |
- printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); |
50 |
-@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU |
51 |
- str[999] = 0; |
52 |
- va_end(ap); |
53 |
- |
54 |
-+#if PY_MAJOR_VERSION >= 3 |
55 |
-+ /* Ensure the error string doesn't start at UTF8 continuation. */ |
56 |
-+ while (*ptr && (*ptr & 0xc0) == 0x80) |
57 |
-+ ptr++; |
58 |
-+#endif |
59 |
-+ |
60 |
- list = PyTuple_New(2); |
61 |
- PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); |
62 |
- Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); |
63 |
-- message = libxml_charPtrConstWrap(str); |
64 |
-+ message = libxml_charPtrConstWrap(ptr); |
65 |
- PyTuple_SetItem(list, 1, message); |
66 |
- result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list); |
67 |
-+ /* Forget any errors caused in the error handler. */ |
68 |
-+ PyErr_Clear(); |
69 |
- Py_XDECREF(list); |
70 |
- Py_XDECREF(result); |
71 |
- } |
72 |
|
73 |
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r2.ebuild |
74 |
deleted file mode 100644 |
75 |
index 2993851ec4a..00000000000 |
76 |
--- a/dev-libs/libxml2/libxml2-2.9.10-r2.ebuild |
77 |
+++ /dev/null |
78 |
@@ -1,224 +0,0 @@ |
79 |
-# Copyright 1999-2020 Gentoo Authors |
80 |
-# Distributed under the terms of the GNU General Public License v2 |
81 |
- |
82 |
-EAPI=7 |
83 |
- |
84 |
-PYTHON_COMPAT=( python3_{6,7,8,9} ) |
85 |
-PYTHON_REQ_USE="xml" |
86 |
- |
87 |
-inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal |
88 |
- |
89 |
-DESCRIPTION="XML C parser and toolkit" |
90 |
-HOMEPAGE="http://www.xmlsoft.org/" |
91 |
- |
92 |
-LICENSE="MIT" |
93 |
-SLOT="2" |
94 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
95 |
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test" |
96 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
97 |
-RESTRICT="!test? ( test )" |
98 |
- |
99 |
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" |
100 |
-XSTS_NAME_1="xmlschema2002-01-16" |
101 |
-XSTS_NAME_2="xmlschema2004-01-14" |
102 |
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" |
103 |
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" |
104 |
-XMLCONF_TARBALL="xmlts20080827.tar.gz" |
105 |
- |
106 |
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz |
107 |
- https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patchset.tar.xz |
108 |
- test? ( |
109 |
- ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} |
110 |
- ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} |
111 |
- http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )" |
112 |
- |
113 |
-RDEPEND=" |
114 |
- >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] |
115 |
- icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) |
116 |
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) |
117 |
- python? ( ${PYTHON_DEPS} ) |
118 |
- readline? ( sys-libs/readline:= ) |
119 |
-" |
120 |
-DEPEND="${RDEPEND}" |
121 |
-BDEPEND=" |
122 |
- dev-util/gtk-doc-am |
123 |
- virtual/pkgconfig |
124 |
-" |
125 |
- |
126 |
-S="${WORKDIR}/${PN}-${PV%_rc*}" |
127 |
- |
128 |
-MULTILIB_CHOST_TOOLS=( |
129 |
- /usr/bin/xml2-config |
130 |
-) |
131 |
- |
132 |
-src_unpack() { |
133 |
- # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, |
134 |
- # as they are needed as tarballs in ${S}/xstc instead and not unpacked |
135 |
- unpack ${P/_rc/-rc}.tar.gz |
136 |
- unpack ${P}-patchset.tar.xz |
137 |
- cd "${S}" || die |
138 |
- |
139 |
- if use test; then |
140 |
- cp "${DISTDIR}/${XSTS_TARBALL_1}" \ |
141 |
- "${DISTDIR}/${XSTS_TARBALL_2}" \ |
142 |
- "${S}"/xstc/ \ |
143 |
- || die "Failed to install test tarballs" |
144 |
- unpack ${XMLCONF_TARBALL} |
145 |
- fi |
146 |
-} |
147 |
- |
148 |
-src_prepare() { |
149 |
- default |
150 |
- |
151 |
- DOCS=( AUTHORS ChangeLog NEWS README* TODO* ) |
152 |
- |
153 |
- # Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5) |
154 |
- eapply "${WORKDIR}"/patches |
155 |
- |
156 |
- # Patches needed for prefix support |
157 |
- eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch |
158 |
- |
159 |
- eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c |
160 |
- |
161 |
- # Fix build for Windows platform |
162 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=760456 |
163 |
- # eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch |
164 |
- |
165 |
- # Fix python detection, bug #567066 |
166 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=760458 |
167 |
- eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch |
168 |
- |
169 |
- # Fix python tests when building out of tree #565576 |
170 |
- eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch |
171 |
- |
172 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
173 |
- # Avoid final linking arguments for python modules |
174 |
- sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die |
175 |
- # gcc-apple doesn't grok -Wno-array-bounds |
176 |
- sed -i -e 's/-Wno-array-bounds//' configure.ac || die |
177 |
- fi |
178 |
- |
179 |
- # Please do not remove, as else we get references to PORTAGE_TMPDIR |
180 |
- # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. |
181 |
- # We now need to run eautoreconf at the end to prevent maintainer mode. |
182 |
-# elibtoolize |
183 |
-# epunt_cxx # if we don't eautoreconf |
184 |
- |
185 |
- eautoreconf |
186 |
-} |
187 |
- |
188 |
-multilib_src_configure() { |
189 |
- # filter seemingly problematic CFLAGS (#26320) |
190 |
- filter-flags -fprefetch-loop-arrays -funroll-loops |
191 |
- |
192 |
- # USE zlib support breaks gnome2 |
193 |
- # (libgnomeprint for instance fails to compile with |
194 |
- # fresh install, and existing) - <azarah@g.o> (22 Dec 2002). |
195 |
- |
196 |
- # The meaning of the 'debug' USE flag does not apply to the --with-debug |
197 |
- # switch (enabling the libxml2 debug module). See bug #100898. |
198 |
- |
199 |
- # --with-mem-debug causes unusual segmentation faults (bug #105120). |
200 |
- |
201 |
- libxml2_configure() { |
202 |
- ECONF_SOURCE="${S}" econf \ |
203 |
- --with-html-subdir=${PF}/html \ |
204 |
- $(use_with debug run-debug) \ |
205 |
- $(use_with icu) \ |
206 |
- $(use_with lzma) \ |
207 |
- $(use_enable ipv6) \ |
208 |
- $(use_enable static-libs static) \ |
209 |
- $(multilib_native_use_with readline) \ |
210 |
- $(multilib_native_use_with readline history) \ |
211 |
- "$@" |
212 |
- } |
213 |
- |
214 |
- libxml2_py_configure() { |
215 |
- mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist |
216 |
- run_in_build_dir libxml2_configure \ |
217 |
- "--with-python=${EPYTHON}" \ |
218 |
- "--with-python-install-dir=$(python_get_sitedir)" |
219 |
- # odd build system, also see bug #582130 |
220 |
- } |
221 |
- |
222 |
- libxml2_configure --without-python # build python bindings separately |
223 |
- |
224 |
- if multilib_is_native_abi && use python; then |
225 |
- python_foreach_impl libxml2_py_configure |
226 |
- fi |
227 |
-} |
228 |
- |
229 |
-multilib_src_compile() { |
230 |
- default |
231 |
- if multilib_is_native_abi && use python; then |
232 |
- local native_builddir=${BUILD_DIR} |
233 |
- python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all |
234 |
- fi |
235 |
-} |
236 |
- |
237 |
-multilib_src_test() { |
238 |
- ln -s "${S}"/xmlconf || die |
239 |
- emake check |
240 |
- multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test |
241 |
-} |
242 |
- |
243 |
-multilib_src_install() { |
244 |
- emake DESTDIR="${D}" \ |
245 |
- EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples 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 |
- python_foreach_impl python_optimize |
254 |
- fi |
255 |
-} |
256 |
- |
257 |
-multilib_src_install_all() { |
258 |
- # on windows, xmllint is installed by interix libxml2 in parent prefix. |
259 |
- # this is the version to use. the native winnt version does not support |
260 |
- # symlinks, which makes repoman fail if the portage tree is linked in |
261 |
- # from another location (which is my default). -- mduft |
262 |
- if [[ ${CHOST} == *-winnt* ]]; then |
263 |
- rm -rf "${ED}"/usr/bin/xmllint |
264 |
- rm -rf "${ED}"/usr/bin/xmlcatalog |
265 |
- fi |
266 |
- |
267 |
- rm -rf "${ED}"/usr/share/doc/${P} |
268 |
- einstalldocs |
269 |
- |
270 |
- if ! use examples; then |
271 |
- rm -rf "${ED}"/usr/share/doc/${PF}/examples |
272 |
- rm -rf "${ED}"/usr/share/doc/${PF}/python/examples |
273 |
- fi |
274 |
- |
275 |
- find "${D}" -name '*.la' -delete || die |
276 |
-} |
277 |
- |
278 |
-pkg_postinst() { |
279 |
- # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not |
280 |
- # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. |
281 |
- if [[ "${ROOT}" != "/" ]]; then |
282 |
- elog "Skipping XML catalog creation for stage building (bug #208887)." |
283 |
- else |
284 |
- # need an XML catalog, so no-one writes to a non-existent one |
285 |
- CATALOG="${EROOT}/etc/xml/catalog" |
286 |
- |
287 |
- # we dont want to clobber an existing catalog though, |
288 |
- # only ensure that one is there |
289 |
- # <obz@g.o> |
290 |
- if [[ ! -e ${CATALOG} ]]; then |
291 |
- [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" |
292 |
- "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" |
293 |
- einfo "Created XML catalog in ${CATALOG}" |
294 |
- fi |
295 |
- fi |
296 |
-} |
297 |
- |
298 |
-libxml2_py_emake() { |
299 |
- pushd "${BUILD_DIR}/python" > /dev/null || die |
300 |
- emake "$@" |
301 |
- popd > /dev/null |
302 |
-} |
303 |
|
304 |
diff --git a/dev-libs/libxml2/libxml2-2.9.9-r4.ebuild b/dev-libs/libxml2/libxml2-2.9.9-r4.ebuild |
305 |
deleted file mode 100644 |
306 |
index 6e250aac8ff..00000000000 |
307 |
--- a/dev-libs/libxml2/libxml2-2.9.9-r4.ebuild |
308 |
+++ /dev/null |
309 |
@@ -1,227 +0,0 @@ |
310 |
-# Copyright 1999-2020 Gentoo Authors |
311 |
-# Distributed under the terms of the GNU General Public License v2 |
312 |
- |
313 |
-EAPI=6 |
314 |
- |
315 |
-PYTHON_COMPAT=( python3_{6,7,8} ) |
316 |
-PYTHON_REQ_USE="xml" |
317 |
- |
318 |
-inherit libtool flag-o-matic python-r1 autotools prefix multilib-minimal |
319 |
- |
320 |
-DESCRIPTION="XML C parser and toolkit" |
321 |
-HOMEPAGE="http://www.xmlsoft.org/" |
322 |
- |
323 |
-LICENSE="MIT" |
324 |
-SLOT="2" |
325 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
326 |
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test" |
327 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
328 |
-RESTRICT="!test? ( test )" |
329 |
- |
330 |
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" |
331 |
-XSTS_NAME_1="xmlschema2002-01-16" |
332 |
-XSTS_NAME_2="xmlschema2004-01-14" |
333 |
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" |
334 |
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" |
335 |
-XMLCONF_TARBALL="xmlts20080827.tar.gz" |
336 |
- |
337 |
-SRC_URI="ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz |
338 |
- https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz |
339 |
- test? ( |
340 |
- ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} |
341 |
- ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} |
342 |
- http://www.w3.org/XML/Test/${XMLCONF_TARBALL} )" |
343 |
- |
344 |
-RDEPEND=" |
345 |
- >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] |
346 |
- icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) |
347 |
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) |
348 |
- python? ( ${PYTHON_DEPS} ) |
349 |
- readline? ( sys-libs/readline:= ) |
350 |
-" |
351 |
-DEPEND="${RDEPEND} |
352 |
- dev-util/gtk-doc-am |
353 |
- virtual/pkgconfig |
354 |
- hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) |
355 |
-" |
356 |
- |
357 |
-S="${WORKDIR}/${PN}-${PV%_rc*}" |
358 |
- |
359 |
-MULTILIB_CHOST_TOOLS=( |
360 |
- /usr/bin/xml2-config |
361 |
-) |
362 |
- |
363 |
-src_unpack() { |
364 |
- # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, |
365 |
- # as they are needed as tarballs in ${S}/xstc instead and not unpacked |
366 |
- unpack ${P/_rc/-rc}.tar.gz |
367 |
- unpack ${P}-patchset.tar.xz |
368 |
- cd "${S}" || die |
369 |
- |
370 |
- if use test; then |
371 |
- cp "${DISTDIR}/${XSTS_TARBALL_1}" \ |
372 |
- "${DISTDIR}/${XSTS_TARBALL_2}" \ |
373 |
- "${S}"/xstc/ \ |
374 |
- || die "Failed to install test tarballs" |
375 |
- unpack ${XMLCONF_TARBALL} |
376 |
- fi |
377 |
-} |
378 |
- |
379 |
-src_prepare() { |
380 |
- default |
381 |
- |
382 |
- DOCS=( AUTHORS ChangeLog NEWS README* TODO* ) |
383 |
- |
384 |
- # Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5) |
385 |
- eapply "${WORKDIR}"/patches |
386 |
- |
387 |
- # Patches needed for prefix support |
388 |
- eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch |
389 |
- |
390 |
- eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c |
391 |
- |
392 |
- # Fix build for Windows platform |
393 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=760456 |
394 |
- # eapply "${FILESDIR}"/${PN}-2.8.0_rc1-winnt.patch |
395 |
- |
396 |
- # Fix python detection, bug #567066 |
397 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=760458 |
398 |
- eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch |
399 |
- |
400 |
- # Fix python tests when building out of tree #565576 |
401 |
- eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch |
402 |
- |
403 |
- # Workaround python3 itstool potential problems, bug 701020 |
404 |
- eapply "${FILESDIR}"/${PV}-python3-unicode-errors.patch |
405 |
- |
406 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
407 |
- # Avoid final linking arguments for python modules |
408 |
- sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die |
409 |
- # gcc-apple doesn't grok -Wno-array-bounds |
410 |
- sed -i -e 's/-Wno-array-bounds//' configure.ac || die |
411 |
- fi |
412 |
- |
413 |
- # Please do not remove, as else we get references to PORTAGE_TMPDIR |
414 |
- # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. |
415 |
- # We now need to run eautoreconf at the end to prevent maintainer mode. |
416 |
-# elibtoolize |
417 |
-# epunt_cxx # if we don't eautoreconf |
418 |
- |
419 |
- eautoreconf |
420 |
-} |
421 |
- |
422 |
-multilib_src_configure() { |
423 |
- # filter seemingly problematic CFLAGS (#26320) |
424 |
- filter-flags -fprefetch-loop-arrays -funroll-loops |
425 |
- |
426 |
- # USE zlib support breaks gnome2 |
427 |
- # (libgnomeprint for instance fails to compile with |
428 |
- # fresh install, and existing) - <azarah@g.o> (22 Dec 2002). |
429 |
- |
430 |
- # The meaning of the 'debug' USE flag does not apply to the --with-debug |
431 |
- # switch (enabling the libxml2 debug module). See bug #100898. |
432 |
- |
433 |
- # --with-mem-debug causes unusual segmentation faults (bug #105120). |
434 |
- |
435 |
- libxml2_configure() { |
436 |
- ECONF_SOURCE="${S}" econf \ |
437 |
- --with-html-subdir=${PF}/html \ |
438 |
- $(use_with debug run-debug) \ |
439 |
- $(use_with icu) \ |
440 |
- $(use_with lzma) \ |
441 |
- $(use_enable ipv6) \ |
442 |
- $(use_enable static-libs static) \ |
443 |
- $(multilib_native_use_with readline) \ |
444 |
- $(multilib_native_use_with readline history) \ |
445 |
- "$@" |
446 |
- } |
447 |
- |
448 |
- libxml2_py_configure() { |
449 |
- mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist |
450 |
- run_in_build_dir libxml2_configure \ |
451 |
- "--with-python=${EPYTHON}" \ |
452 |
- "--with-python-install-dir=$(python_get_sitedir)" |
453 |
- # odd build system, also see bug #582130 |
454 |
- } |
455 |
- |
456 |
- libxml2_configure --without-python # build python bindings separately |
457 |
- |
458 |
- if multilib_is_native_abi && use python; then |
459 |
- python_foreach_impl libxml2_py_configure |
460 |
- fi |
461 |
-} |
462 |
- |
463 |
-multilib_src_compile() { |
464 |
- default |
465 |
- if multilib_is_native_abi && use python; then |
466 |
- local native_builddir=${BUILD_DIR} |
467 |
- python_foreach_impl libxml2_py_emake top_builddir="${native_builddir}" all |
468 |
- fi |
469 |
-} |
470 |
- |
471 |
-multilib_src_test() { |
472 |
- ln -s "${S}"/xmlconf || die |
473 |
- emake check |
474 |
- multilib_is_native_abi && use python && python_foreach_impl libxml2_py_emake test |
475 |
-} |
476 |
- |
477 |
-multilib_src_install() { |
478 |
- emake DESTDIR="${D}" \ |
479 |
- EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples install |
480 |
- |
481 |
- if multilib_is_native_abi && use python; then |
482 |
- python_foreach_impl libxml2_py_emake \ |
483 |
- DESTDIR="${D}" \ |
484 |
- docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ |
485 |
- exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ |
486 |
- install |
487 |
- python_foreach_impl python_optimize |
488 |
- fi |
489 |
-} |
490 |
- |
491 |
-multilib_src_install_all() { |
492 |
- # on windows, xmllint is installed by interix libxml2 in parent prefix. |
493 |
- # this is the version to use. the native winnt version does not support |
494 |
- # symlinks, which makes repoman fail if the portage tree is linked in |
495 |
- # from another location (which is my default). -- mduft |
496 |
- if [[ ${CHOST} == *-winnt* ]]; then |
497 |
- rm -rf "${ED}"/usr/bin/xmllint |
498 |
- rm -rf "${ED}"/usr/bin/xmlcatalog |
499 |
- fi |
500 |
- |
501 |
- rm -rf "${ED}"/usr/share/doc/${P} |
502 |
- einstalldocs |
503 |
- |
504 |
- if ! use examples; then |
505 |
- rm -rf "${ED}"/usr/share/doc/${PF}/examples |
506 |
- rm -rf "${ED}"/usr/share/doc/${PF}/python/examples |
507 |
- fi |
508 |
- |
509 |
- find "${D}" -name '*.la' -delete || die |
510 |
-} |
511 |
- |
512 |
-pkg_postinst() { |
513 |
- # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not |
514 |
- # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. |
515 |
- if [[ "${ROOT}" != "/" ]]; then |
516 |
- elog "Skipping XML catalog creation for stage building (bug #208887)." |
517 |
- else |
518 |
- # need an XML catalog, so no-one writes to a non-existent one |
519 |
- CATALOG="${EROOT}etc/xml/catalog" |
520 |
- |
521 |
- # we dont want to clobber an existing catalog though, |
522 |
- # only ensure that one is there |
523 |
- # <obz@g.o> |
524 |
- if [[ ! -e ${CATALOG} ]]; then |
525 |
- [[ -d "${EROOT}etc/xml" ]] || mkdir -p "${EROOT}etc/xml" |
526 |
- "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" |
527 |
- einfo "Created XML catalog in ${CATALOG}" |
528 |
- fi |
529 |
- fi |
530 |
-} |
531 |
- |
532 |
-libxml2_py_emake() { |
533 |
- pushd "${BUILD_DIR}/python" > /dev/null || die |
534 |
- emake "$@" |
535 |
- popd > /dev/null |
536 |
-} |