1 |
commit: 1f361d68bae474c55c7d08826107f9b2ef73ae81 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 29 13:46:13 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 29 13:46:13 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f361d68 |
7 |
|
8 |
dev-libs/libxml2: drop 2.9.10-r5, 2.9.12, 2.9.12-r2, 2.9.12-r3 |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
dev-libs/libxml2/Manifest | 5 - |
13 |
.../libxml2/files/libxml2-2.7.1-catalog_path.patch | 66 ------ |
14 |
.../libxml2/files/libxml2-2.9.10-remove-TRUE.patch | 24 -- |
15 |
.../files/libxml2-2.9.10-xmllint-utf8.patch | 30 --- |
16 |
.../files/libxml2-2.9.11-disable-fuzz-tests.patch | 33 --- |
17 |
.../files/libxml2-2.9.2-python-ABIFLAG.patch | 11 - |
18 |
.../files/libxml2-2.9.8-out-of-tree-test.patch | 32 --- |
19 |
.../libxml2-2.9.8-python3-unicode-errors.patch | 33 --- |
20 |
dev-libs/libxml2/libxml2-2.9.10-r5.ebuild | 240 -------------------- |
21 |
dev-libs/libxml2/libxml2-2.9.12-r2.ebuild | 249 -------------------- |
22 |
dev-libs/libxml2/libxml2-2.9.12-r3.ebuild | 251 --------------------- |
23 |
dev-libs/libxml2/libxml2-2.9.12.ebuild | 240 -------------------- |
24 |
12 files changed, 1214 deletions(-) |
25 |
|
26 |
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest |
27 |
index a3ddfee2530..f529aea0838 100644 |
28 |
--- a/dev-libs/libxml2/Manifest |
29 |
+++ b/dev-libs/libxml2/Manifest |
30 |
@@ -1,11 +1,6 @@ |
31 |
-DIST libxml2-2.9.10-r1-patchset.tar.xz 72088 BLAKE2B 4d5f8aed35d6c0232089e09f22a77cbd25cbd2007c1330538e1c7acc4398ec3ef9023289129677cf5499dbacde4c2f28850ae81acab351d02625d3452aedaede SHA512 a63032d1e85128f637c2b54356aab06a17e31eb1f5facd8fdf88463eb21df6a1d9fd8cc751fa94b8d322fa4f796be4e1d9aa071cbd0826ab31fae46525fde952 |
32 |
-DIST libxml2-2.9.10.tar.gz 5624761 BLAKE2B a9958bd7db17fbfb8259b64d66548eb19d28f1aecf40cf66752fcec5720855d31cea9941d52963badd8c18ea1770485f1c11da6213149458336ce0273418f421 SHA512 0adfd12bfde89cbd6296ba6e66b6bed4edb814a74b4265bda34d95c41d9d92c696ee7adb0c737aaf9cc6e10426a31a35079b2a23d26c074e299858da12c072ed |
33 |
-DIST libxml2-2.9.12-r2-patchset.tar.bz2 5939 BLAKE2B e518a174385a121ca5545d0a51c2a2b4ddd21b1e7996e2806f368588b27d60e8318ab50ebfb90c3ee57ccece4f1c37e05c1daeed4203a4e9cb5a056ba530ad2b SHA512 06b96ab8426cd560c1147998965b5e718bee08536549a278269f6535ff1460ed97d83067ed0e8a4d834145a5e5a6caa912cf8aa5a33a360e4b1bc9d9135bfb04 |
34 |
-DIST libxml2-2.9.12-r3-patchset.tar.bz2 6281 BLAKE2B b7038f85009afdacc2fcf0b9cf30f915f20a2c8dfbe3749c6e74c637191f97169ee46b26deac5e347230d956f2d5aded218d09f0232f23b39ef4ad5e2fd09f61 SHA512 8170462eb3ecd2f834650309498a4e586fb3edb3114f42b3c95e96dc2ca81181e70ccd1790c440bd7ef4f489a2311b99765dcd12d9fb52207a11fb4394409ae8 |
35 |
DIST libxml2-2.9.12-r5-patchset.tar.bz2 7231 BLAKE2B d9d0d56ebccbfe234a8af04cc5343c1a02d84fbd998c2373fd48be59cf92807a9417db650a6bb6ba309e101994c4ae2b28edda7bf635c7728eb8b8047d0d3391 SHA512 b2db0fe4595c1559d9f8dc836ee6eee469191f6c490fc95d25d9fa99a544e80858894cc35b6e4a6624a38d0309800540badc929e86ef29950c1107caa4656a14 |
36 |
DIST libxml2-2.9.12.tar.gz 5681632 BLAKE2B ab93633140e9fd119d3a48ed829a91213c3d7956a00d181203f5188fb0ed0d3a7150d3128fe986b13efadf6fe484393262a3de575527f38f74aa6c0067a6d934 SHA512 df1c6486e80f0fcf3c506f3599bcfb94b620c00d0b5d26831bc983daa78d58ec58b5057b1ec7c1a26c694f40199c6234ee2a6dcabf65abfa10c447cb5705abbd |
37 |
DIST libxml2-2.9.12.tar.gz.asc 488 BLAKE2B 48ec86ec373d94de73bdb52141fc77fccd0ca296a35ed97aa3479ecdcf82b15422dd7d751359b5b1ca477e24b8eee9226784cfbfd861236e10eed2519e7959bf SHA512 69ca6ab7170cad467724e19eff99a3544966a26069e78a7b7cc27ae93a9077b11cc8dad2536bd0b27c3b45f4ea7520c813fe5a018cd65f103059f7f75147a656 |
38 |
-DIST xmlts20080827.tar.gz 638940 BLAKE2B c5aab959c6e0698acd5b9be82b48a8ac26f4d01cc03f9acfff20d344f97f4711fc6d4a524ae70457147e8e30c72e27b6726829e1dd21896286aa974ed60774e7 SHA512 7325d0977c4427fc4944b291ccf896a665f654cc24399e5565c12a849c2bc3aef4fa3ee42a09ac115abcb6570c51a8fbd052c38d64d164279ecdecad5a4e884d |
39 |
DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733 |
40 |
DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 |
41 |
DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe |
42 |
|
43 |
diff --git a/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch b/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch |
44 |
deleted file mode 100644 |
45 |
index 3f69ec2a4d8..00000000000 |
46 |
--- a/dev-libs/libxml2/files/libxml2-2.7.1-catalog_path.patch |
47 |
+++ /dev/null |
48 |
@@ -1,66 +0,0 @@ |
49 |
---- a/catalog.c |
50 |
-+++ b/catalog.c |
51 |
-@@ -68,10 +68,10 @@ |
52 |
- #define XML_URN_PUBID "urn:publicid:" |
53 |
- #define XML_CATAL_BREAK ((xmlChar *) -1) |
54 |
- #ifndef XML_XML_DEFAULT_CATALOG |
55 |
--#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" |
56 |
-+#define XML_XML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog" |
57 |
- #endif |
58 |
- #ifndef XML_SGML_DEFAULT_CATALOG |
59 |
--#define XML_SGML_DEFAULT_CATALOG "file:///etc/sgml/catalog" |
60 |
-+#define XML_SGML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog" |
61 |
- #endif |
62 |
- |
63 |
- #if defined(_WIN32) && defined(_MSC_VER) |
64 |
-@@ -76,7 +76,7 @@ |
65 |
- |
66 |
- #if defined(_WIN32) && defined(_MSC_VER) |
67 |
- #undef XML_XML_DEFAULT_CATALOG |
68 |
--static char XML_XML_DEFAULT_CATALOG[256] = "file:///etc/xml/catalog"; |
69 |
-+static char XML_XML_DEFAULT_CATALOG[256] = "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"; |
70 |
- #if defined(_WIN32_WCE) |
71 |
- /* Windows CE don't have a A variant */ |
72 |
- #define GetModuleHandleA GetModuleHandle |
73 |
---- a/xmlcatalog.c |
74 |
-+++ b/xmlcatalog.c |
75 |
-@@ -43,7 +43,7 @@ |
76 |
- |
77 |
- |
78 |
- #ifndef XML_SGML_DEFAULT_CATALOG |
79 |
--#define XML_SGML_DEFAULT_CATALOG "/etc/sgml/catalog" |
80 |
-+#define XML_SGML_DEFAULT_CATALOG "@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog" |
81 |
- #endif |
82 |
- |
83 |
- /************************************************************************ |
84 |
---- a/runtest.c |
85 |
-+++ b/runtest.c |
86 |
-@@ -2747,7 +2747,7 @@ |
87 |
- */ |
88 |
- static int |
89 |
- uripMatch(const char * URI) { |
90 |
-- if ((URI == NULL) || (!strcmp(URI, "file:///etc/xml/catalog"))) |
91 |
-+ if ((URI == NULL) || (!strcmp(URI, "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"))) |
92 |
- return(0); |
93 |
- /* Verify we received the escaped URL */ |
94 |
- if (strcmp(urip_rcvsURLs[urip_current], URI)) |
95 |
-@@ -2766,7 +2766,7 @@ |
96 |
- */ |
97 |
- static void * |
98 |
- uripOpen(const char * URI) { |
99 |
-- if ((URI == NULL) || (!strcmp(URI, "file:///etc/xml/catalog"))) |
100 |
-+ if ((URI == NULL) || (!strcmp(URI, "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog"))) |
101 |
- return(NULL); |
102 |
- /* Verify we received the escaped URL */ |
103 |
- if (strcmp(urip_rcvsURLs[urip_current], URI)) |
104 |
---- a/xmllint.c |
105 |
-+++ b/xmllint.c |
106 |
-@@ -103,7 +103,7 @@ |
107 |
- #endif |
108 |
- |
109 |
- #ifndef XML_XML_DEFAULT_CATALOG |
110 |
--#define XML_XML_DEFAULT_CATALOG "file:///etc/xml/catalog" |
111 |
-+#define XML_XML_DEFAULT_CATALOG "file://@GENTOO_PORTAGE_EPREFIX@/etc/xml/catalog" |
112 |
- #endif |
113 |
- |
114 |
- typedef enum { |
115 |
|
116 |
diff --git a/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch b/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch |
117 |
deleted file mode 100644 |
118 |
index c979c841477..00000000000 |
119 |
--- a/dev-libs/libxml2/files/libxml2-2.9.10-remove-TRUE.patch |
120 |
+++ /dev/null |
121 |
@@ -1,24 +0,0 @@ |
122 |
-https://bugs.gentoo.org/751922 |
123 |
-https://gitlab.gnome.org/GNOME/libxml2/-/issues/202 |
124 |
- |
125 |
-From c1bae734f3850f6900cf54d186ca0a9102895d82 Mon Sep 17 00:00:00 2001 |
126 |
-From: Lars Wendler <polynomial-c@g.o> |
127 |
-Date: Fri, 30 Oct 2020 10:27:23 +0100 |
128 |
-Subject: [PATCH] Fix build with icu-68.1 |
129 |
- |
130 |
-icu-68.1 removed macro definitions for TRUE and FALSE |
131 |
- |
132 |
-Signed-off-by: Lars Wendler <polynomial-c@g.o> |
133 |
---- |
134 |
---- a/encoding.c |
135 |
-+++ b/encoding.c |
136 |
-@@ -1958,7 +1958,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out, |
137 |
- #ifdef LIBXML_ICU_ENABLED |
138 |
- else if (handler->uconv_out != NULL) { |
139 |
- ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen, |
140 |
-- TRUE); |
141 |
-+ 1); |
142 |
- } |
143 |
- #endif /* LIBXML_ICU_ENABLED */ |
144 |
- else { |
145 |
--- |
146 |
|
147 |
diff --git a/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch b/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch |
148 |
deleted file mode 100644 |
149 |
index 205b26b54f8..00000000000 |
150 |
--- a/dev-libs/libxml2/files/libxml2-2.9.10-xmllint-utf8.patch |
151 |
+++ /dev/null |
152 |
@@ -1,30 +0,0 @@ |
153 |
-https://bugs.gentoo.org/749849 |
154 |
- |
155 |
-From 50f06b3efb638efb0abd95dc62dca05ae67882c2 Mon Sep 17 00:00:00 2001 |
156 |
-From: Nick Wellnhofer <wellnhofer@×××××.de> |
157 |
-Date: Fri, 7 Aug 2020 21:54:27 +0200 |
158 |
-Subject: [PATCH] Fix out-of-bounds read with 'xmllint --htmlout' |
159 |
- |
160 |
-Make sure that truncated UTF-8 sequences don't cause an out-of-bounds |
161 |
-array access. |
162 |
- |
163 |
-Thanks to @SuhwanSong and the Agency for Defense Development (ADD) for |
164 |
-the report. |
165 |
- |
166 |
-Fixes #178. |
167 |
---- a/xmllint.c |
168 |
-+++ b/xmllint.c |
169 |
-@@ -528,6 +528,12 @@ static void |
170 |
- xmlHTMLEncodeSend(void) { |
171 |
- char *result; |
172 |
- |
173 |
-+ /* |
174 |
-+ * xmlEncodeEntitiesReentrant assumes valid UTF-8, but the buffer might |
175 |
-+ * end with a truncated UTF-8 sequence. This is a hack to at least avoid |
176 |
-+ * an out-of-bounds read. |
177 |
-+ */ |
178 |
-+ memset(&buffer[sizeof(buffer)-4], 0, 4); |
179 |
- result = (char *) xmlEncodeEntitiesReentrant(NULL, BAD_CAST buffer); |
180 |
- if (result) { |
181 |
- xmlGenericError(xmlGenericErrorContext, "%s", result); |
182 |
--- |
183 |
|
184 |
diff --git a/dev-libs/libxml2/files/libxml2-2.9.11-disable-fuzz-tests.patch b/dev-libs/libxml2/files/libxml2-2.9.11-disable-fuzz-tests.patch |
185 |
deleted file mode 100644 |
186 |
index 7f6fd4ae826..00000000000 |
187 |
--- a/dev-libs/libxml2/files/libxml2-2.9.11-disable-fuzz-tests.patch |
188 |
+++ /dev/null |
189 |
@@ -1,33 +0,0 @@ |
190 |
-https://gitlab.gnome.org/GNOME/libxml2/-/issues/252 |
191 |
- |
192 |
-From 5d6403682a3463f29a1f7c27aa54ecb5e3971547 Mon Sep 17 00:00:00 2001 |
193 |
-From: Sam James <sam@g.o> |
194 |
-Date: Thu, 13 May 2021 17:40:22 +0000 |
195 |
-Subject: [PATCH] Disable fuzz tests |
196 |
- |
197 |
-Not all of the fuzz files are included with the dist tarball, |
198 |
-so disabling them for now to get the release in with most tests |
199 |
-given the security bug. |
200 |
---- a/Makefile.am |
201 |
-+++ b/Makefile.am |
202 |
-@@ -2,9 +2,9 @@ |
203 |
- |
204 |
- ACLOCAL_AMFLAGS = -I m4 |
205 |
- |
206 |
--SUBDIRS = include . doc example fuzz xstc $(PYTHON_SUBDIR) |
207 |
-+SUBDIRS = include . doc example xstc $(PYTHON_SUBDIR) |
208 |
- |
209 |
--DIST_SUBDIRS = include . doc example fuzz python xstc |
210 |
-+DIST_SUBDIRS = include . doc example python xstc |
211 |
- |
212 |
- AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include |
213 |
- |
214 |
-@@ -210,7 +210,6 @@ runtests: runtest$(EXEEXT) testrecurse$(EXEEXT) testapi$(EXEEXT) \ |
215 |
- $(CHECKER) ./runxmlconf$(EXEEXT) |
216 |
- @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; \ |
217 |
- $(MAKE) tests ; fi) |
218 |
-- @cd fuzz; $(MAKE) tests |
219 |
- |
220 |
- check: all runtests |
221 |
- |
222 |
--- |
223 |
|
224 |
diff --git a/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch b/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch |
225 |
deleted file mode 100644 |
226 |
index 7c5557f9915..00000000000 |
227 |
--- a/dev-libs/libxml2/files/libxml2-2.9.2-python-ABIFLAG.patch |
228 |
+++ /dev/null |
229 |
@@ -1,11 +0,0 @@ |
230 |
---- a/configure.ac |
231 |
-+++ b/configure.ac |
232 |
-@@ -844,7 +844,7 @@ if test "$with_python" != "no" ; then |
233 |
- fi |
234 |
- if test "$PYTHON" != "" |
235 |
- then |
236 |
-- PYTHON_VERSION=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_version())"` |
237 |
-+ PYTHON_VERSION=`$PYTHON -c "import sysconfig; print(sysconfig.get_config_var('LDVERSION') or sysconfig.get_config_var('py_version_short'))"` |
238 |
- PYTHON_INCLUDES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_inc())"` |
239 |
- # does not work as it produce a /usr/lib/python path instead of/usr/lib64/python |
240 |
- # |
241 |
|
242 |
diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch b/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch |
243 |
deleted file mode 100644 |
244 |
index 1e269c3387b..00000000000 |
245 |
--- a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch |
246 |
+++ /dev/null |
247 |
@@ -1,32 +0,0 @@ |
248 |
-https://gitlab.gnome.org/GNOME/libxml2/merge_requests/14 |
249 |
- |
250 |
-From 54878c018af979b20ca1bfbf12599973484cae5b Mon Sep 17 00:00:00 2001 |
251 |
-From: Mike Frysinger <vapier@g.o> |
252 |
-Date: Thu, 3 Jan 2019 05:44:03 -0500 |
253 |
-Subject: [PATCH] fix reader5.py test when building out of tree |
254 |
- |
255 |
-When building out of tree, the relative path this test uses doesn't |
256 |
-work. Resolve the path relative to the test script itself instead. |
257 |
- |
258 |
-Url: https://bugs.gentoo.org/565576 |
259 |
---- a/python/tests/reader5.py |
260 |
-+++ b/python/tests/reader5.py |
261 |
-@@ -4,6 +4,7 @@ |
262 |
- # this extract the Dragon bibliography entries from the XML specification |
263 |
- # |
264 |
- import libxml2 |
265 |
-+import os |
266 |
- import sys |
267 |
- |
268 |
- # Memory debug specific |
269 |
-@@ -14,7 +15,8 @@ Ravi Sethi, and Jeffrey D. Ullman. |
270 |
- <emph>Compilers: Principles, Techniques, and Tools</emph>. |
271 |
- Reading: Addison-Wesley, 1986, rpt. corr. 1988.</bibl>""" |
272 |
- |
273 |
--f = open('../../test/valid/REC-xml-19980210.xml', 'rb') |
274 |
-+basedir = os.path.dirname(os.path.realpath(__file__)) |
275 |
-+f = open(os.path.join(basedir, '../../test/valid/REC-xml-19980210.xml'), 'rb') |
276 |
- input = libxml2.inputBuffer(f) |
277 |
- reader = input.newTextReader("REC") |
278 |
- res="" |
279 |
--- |
280 |
|
281 |
diff --git a/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch b/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch |
282 |
deleted file mode 100644 |
283 |
index db20221afe4..00000000000 |
284 |
--- a/dev-libs/libxml2/files/libxml2-2.9.8-python3-unicode-errors.patch |
285 |
+++ /dev/null |
286 |
@@ -1,33 +0,0 @@ |
287 |
-https://bugs.gentoo.org/745162 |
288 |
---- a/python/libxml.c |
289 |
-+++ b/python/libxml.c |
290 |
-@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU |
291 |
- PyObject *message; |
292 |
- PyObject *result; |
293 |
- char str[1000]; |
294 |
-+ unsigned char *ptr = (unsigned char *)str; |
295 |
- |
296 |
- #ifdef DEBUG_ERROR |
297 |
- printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg); |
298 |
-@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU |
299 |
- str[999] = 0; |
300 |
- va_end(ap); |
301 |
- |
302 |
-+#if PY_MAJOR_VERSION >= 3 |
303 |
-+ /* Ensure the error string doesn't start at UTF8 continuation. */ |
304 |
-+ while (*ptr && (*ptr & 0xc0) == 0x80) |
305 |
-+ ptr++; |
306 |
-+#endif |
307 |
-+ |
308 |
- list = PyTuple_New(2); |
309 |
- PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt); |
310 |
- Py_XINCREF(libxml_xmlPythonErrorFuncCtxt); |
311 |
-- message = libxml_charPtrConstWrap(str); |
312 |
-+ message = libxml_charPtrConstWrap(ptr); |
313 |
- PyTuple_SetItem(list, 1, message); |
314 |
- result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list); |
315 |
-+ /* Forget any errors caused in the error handler. */ |
316 |
-+ PyErr_Clear(); |
317 |
- Py_XDECREF(list); |
318 |
- Py_XDECREF(result); |
319 |
- } |
320 |
|
321 |
diff --git a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild b/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild |
322 |
deleted file mode 100644 |
323 |
index 97ea995cd04..00000000000 |
324 |
--- a/dev-libs/libxml2/libxml2-2.9.10-r5.ebuild |
325 |
+++ /dev/null |
326 |
@@ -1,240 +0,0 @@ |
327 |
-# Copyright 1999-2021 Gentoo Authors |
328 |
-# Distributed under the terms of the GNU General Public License v2 |
329 |
- |
330 |
-EAPI=7 |
331 |
- |
332 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
333 |
-PYTHON_REQ_USE="xml" |
334 |
- |
335 |
-inherit autotools flag-o-matic prefix python-r1 multilib-minimal |
336 |
- |
337 |
-# Note: Please bump in sync with dev-libs/libxslt |
338 |
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" |
339 |
-XSTS_NAME_1="xmlschema2002-01-16" |
340 |
-XSTS_NAME_2="xmlschema2004-01-14" |
341 |
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" |
342 |
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" |
343 |
-XMLCONF_TARBALL="xmlts20080827.tar.gz" |
344 |
-DESCRIPTION="XML C parser and toolkit" |
345 |
-HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" |
346 |
-SRC_URI=" |
347 |
- ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz |
348 |
- https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-r1-patchset.tar.xz |
349 |
- test? ( |
350 |
- ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} |
351 |
- ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} |
352 |
- http://www.w3.org/XML/Test/${XMLCONF_TARBALL} |
353 |
- ) |
354 |
-" |
355 |
-S="${WORKDIR}/${PN}-${PV%_rc*}" |
356 |
- |
357 |
-LICENSE="MIT" |
358 |
-SLOT="2" |
359 |
-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" |
360 |
- |
361 |
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test" |
362 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
363 |
-RESTRICT="!test? ( test )" |
364 |
- |
365 |
-BDEPEND=" |
366 |
- dev-util/gtk-doc-am |
367 |
- virtual/pkgconfig |
368 |
-" |
369 |
-RDEPEND=" |
370 |
- >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] |
371 |
- icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) |
372 |
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) |
373 |
- python? ( ${PYTHON_DEPS} ) |
374 |
- readline? ( sys-libs/readline:= ) |
375 |
-" |
376 |
-DEPEND="${RDEPEND}" |
377 |
- |
378 |
-MULTILIB_CHOST_TOOLS=( |
379 |
- /usr/bin/xml2-config |
380 |
-) |
381 |
- |
382 |
-src_unpack() { |
383 |
- # ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR, |
384 |
- # as they are needed as tarballs in ${S}/xstc instead and not unpacked |
385 |
- unpack ${P/_rc/-rc}.tar.gz |
386 |
- unpack ${P}-r1-patchset.tar.xz |
387 |
- cd "${S}" || die |
388 |
- |
389 |
- if use test ; then |
390 |
- cp "${DISTDIR}/${XSTS_TARBALL_1}" \ |
391 |
- "${DISTDIR}/${XSTS_TARBALL_2}" \ |
392 |
- "${S}"/xstc/ \ |
393 |
- || die "Failed to install test tarballs" |
394 |
- unpack ${XMLCONF_TARBALL} |
395 |
- fi |
396 |
-} |
397 |
- |
398 |
-src_prepare() { |
399 |
- default |
400 |
- |
401 |
- DOCS=( AUTHORS ChangeLog NEWS README* TODO* ) |
402 |
- |
403 |
- # Selective cherry-picks from master up to 2019-02-28 (commit 8161b463f5) |
404 |
- eapply "${WORKDIR}"/patches |
405 |
- |
406 |
- # Patches needed for prefix support |
407 |
- eapply "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch |
408 |
- |
409 |
- eapply "${FILESDIR}"/${P}-remove-TRUE.patch |
410 |
- |
411 |
- eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c |
412 |
- |
413 |
- # Fix python detection, bug #567066 |
414 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=760458 |
415 |
- eapply "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch |
416 |
- |
417 |
- # Fix python tests when building out of tree #565576 |
418 |
- eapply "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch |
419 |
- |
420 |
- # bug #745162 |
421 |
- eapply "${FILESDIR}"/${PN}-2.9.8-python3-unicode-errors.patch |
422 |
- |
423 |
- # bug #749849 |
424 |
- eapply "${FILESDIR}"/${PN}-2.9.10-xmllint-utf8.patch |
425 |
- |
426 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
427 |
- # Avoid final linking arguments for python modules |
428 |
- sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die |
429 |
- # gcc-apple doesn't grok -Wno-array-bounds |
430 |
- sed -i -e 's/-Wno-array-bounds//' configure.ac || die |
431 |
- fi |
432 |
- |
433 |
- # Please do not remove, as else we get references to PORTAGE_TMPDIR |
434 |
- # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. |
435 |
- # We now need to run eautoreconf at the end to prevent maintainer mode. |
436 |
- # elibtoolize |
437 |
- # If we don't eautoreconf, we need this instead |
438 |
- # epunt_cxx |
439 |
- |
440 |
- eautoreconf |
441 |
-} |
442 |
- |
443 |
-multilib_src_configure() { |
444 |
- # Filter seemingly problematic CFLAGS (#26320) |
445 |
- filter-flags -fprefetch-loop-arrays -funroll-loops |
446 |
- |
447 |
- # Notes: |
448 |
- # 1) USE zlib support breaks gnome2 |
449 |
- # (libgnomeprint for instance fails to compile with |
450 |
- # fresh install, and existing) - <azarah@g.o> (22 Dec 2002). |
451 |
- # |
452 |
- # 2) The meaning of the 'debug' USE flag does not apply to the --with-debug |
453 |
- # switch (enabling the libxml2 debug module). See bug #100898. |
454 |
- # |
455 |
- # 3) --with-mem-debug causes unusual segmentation faults (bug #105120). |
456 |
- |
457 |
- libxml2_configure() { |
458 |
- ECONF_SOURCE="${S}" econf \ |
459 |
- --with-html-subdir=${PF}/html \ |
460 |
- $(use_with debug run-debug) \ |
461 |
- $(use_with icu) \ |
462 |
- $(use_with lzma) \ |
463 |
- $(use_enable ipv6) \ |
464 |
- $(use_enable static-libs static) \ |
465 |
- $(multilib_native_use_with readline) \ |
466 |
- $(multilib_native_use_with readline history) \ |
467 |
- "$@" |
468 |
- } |
469 |
- |
470 |
- libxml2_py_configure() { |
471 |
- # Ensure python build dirs exist |
472 |
- mkdir -p "${BUILD_DIR}" || die |
473 |
- |
474 |
- # Odd build system, also see bug #582130 |
475 |
- run_in_build_dir libxml2_configure \ |
476 |
- "--with-python=${EPYTHON}" \ |
477 |
- "--with-python-install-dir=$(python_get_sitedir)" |
478 |
- } |
479 |
- |
480 |
- # Build python bindings separately |
481 |
- libxml2_configure --without-python |
482 |
- |
483 |
- if multilib_is_native_abi && use python ; then |
484 |
- python_foreach_impl libxml2_py_configure |
485 |
- fi |
486 |
-} |
487 |
- |
488 |
-libxml2_py_emake() { |
489 |
- pushd "${BUILD_DIR}/python" > /dev/null || die |
490 |
- |
491 |
- emake "$@" |
492 |
- |
493 |
- popd > /dev/null || die |
494 |
-} |
495 |
- |
496 |
-multilib_src_compile() { |
497 |
- default |
498 |
- |
499 |
- if multilib_is_native_abi && use python ; then |
500 |
- local native_builddir="${BUILD_DIR}" |
501 |
- |
502 |
- python_foreach_impl libxml2_py_emake \ |
503 |
- top_builddir="${native_builddir}" \ |
504 |
- all |
505 |
- fi |
506 |
-} |
507 |
- |
508 |
-multilib_src_test() { |
509 |
- ln -s "${S}"/xmlconf || die |
510 |
- |
511 |
- emake check |
512 |
- |
513 |
- if multilib_is_native_abi && use python ; then |
514 |
- python_foreach_impl libxml2_py_emake test |
515 |
- fi |
516 |
-} |
517 |
- |
518 |
-multilib_src_install() { |
519 |
- emake \ |
520 |
- DESTDIR="${D}" \ |
521 |
- EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \ |
522 |
- install |
523 |
- |
524 |
- if multilib_is_native_abi && use python ; then |
525 |
- python_foreach_impl libxml2_py_emake \ |
526 |
- DESTDIR="${D}" \ |
527 |
- docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ |
528 |
- exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ |
529 |
- install |
530 |
- |
531 |
- python_foreach_impl python_optimize |
532 |
- fi |
533 |
-} |
534 |
- |
535 |
-multilib_src_install_all() { |
536 |
- rm -rf "${ED}"/usr/share/doc/${P} |
537 |
- |
538 |
- einstalldocs |
539 |
- |
540 |
- if ! use examples ; then |
541 |
- rm -rf "${ED}"/usr/share/doc/${PF}/examples |
542 |
- rm -rf "${ED}"/usr/share/doc/${PF}/python/examples |
543 |
- fi |
544 |
- |
545 |
- find "${D}" -name '*.la' -delete || die |
546 |
-} |
547 |
- |
548 |
-pkg_postinst() { |
549 |
- # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not |
550 |
- # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. |
551 |
- if [[ -n "${ROOT}" ]]; then |
552 |
- elog "Skipping XML catalog creation for stage building (bug #208887)." |
553 |
- else |
554 |
- # Need an XML catalog, so no-one writes to a non-existent one |
555 |
- CATALOG="${EROOT}/etc/xml/catalog" |
556 |
- |
557 |
- # We don't want to clobber an existing catalog though, |
558 |
- # only ensure that one is there |
559 |
- # <obz@g.o> |
560 |
- if [[ ! -e "${CATALOG}" ]]; then |
561 |
- [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" |
562 |
- "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" |
563 |
- einfo "Created XML catalog in ${CATALOG}" |
564 |
- fi |
565 |
- fi |
566 |
-} |
567 |
|
568 |
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild |
569 |
deleted file mode 100644 |
570 |
index c00357fd49f..00000000000 |
571 |
--- a/dev-libs/libxml2/libxml2-2.9.12-r2.ebuild |
572 |
+++ /dev/null |
573 |
@@ -1,249 +0,0 @@ |
574 |
-# Copyright 1999-2021 Gentoo Authors |
575 |
-# Distributed under the terms of the GNU General Public License v2 |
576 |
- |
577 |
-EAPI=7 |
578 |
- |
579 |
-# Note: Please bump in sync with dev-libs/libxslt |
580 |
- |
581 |
-PATCHSET_VERSION="2.9.12-r2-patchset" |
582 |
- |
583 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
584 |
-PYTHON_REQ_USE="xml" |
585 |
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/danielveillard.asc |
586 |
-inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig |
587 |
- |
588 |
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" |
589 |
-XSTS_NAME_1="xmlschema2002-01-16" |
590 |
-XSTS_NAME_2="xmlschema2004-01-14" |
591 |
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" |
592 |
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" |
593 |
-XMLCONF_TARBALL="xmlts20130923.tar.gz" |
594 |
-DESCRIPTION="XML C parser and toolkit" |
595 |
-HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" |
596 |
-SRC_URI=" |
597 |
- ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz |
598 |
- https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2 |
599 |
- test? ( |
600 |
- ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} |
601 |
- ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} |
602 |
- https://www.w3.org/XML/Test/${XMLCONF_TARBALL} |
603 |
- ) |
604 |
- verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc ) |
605 |
-" |
606 |
-S="${WORKDIR}/${PN}-${PV%_rc*}" |
607 |
- |
608 |
-LICENSE="MIT" |
609 |
-SLOT="2" |
610 |
-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" |
611 |
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test" |
612 |
-RESTRICT="!test? ( test )" |
613 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
614 |
- |
615 |
-BDEPEND=" |
616 |
- dev-util/gtk-doc-am |
617 |
- virtual/pkgconfig |
618 |
- verify-sig? ( app-crypt/openpgp-keys-danielveillard ) |
619 |
-" |
620 |
-RDEPEND=" |
621 |
- >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] |
622 |
- icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) |
623 |
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) |
624 |
- python? ( ${PYTHON_DEPS} ) |
625 |
- readline? ( sys-libs/readline:= ) |
626 |
-" |
627 |
-DEPEND="${RDEPEND}" |
628 |
- |
629 |
-MULTILIB_CHOST_TOOLS=( |
630 |
- /usr/bin/xml2-config |
631 |
-) |
632 |
- |
633 |
-DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS ) |
634 |
- |
635 |
-PATCHES=( |
636 |
- ## Gentoo |
637 |
- # Patches needed for prefix support |
638 |
- "${WORKDIR}"/${PN}-2.7.1-catalog_path.patch |
639 |
- |
640 |
- # Fix python detection, bug #567066 |
641 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=760458 |
642 |
- "${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch |
643 |
- |
644 |
- # Fix python tests when building out of tree #565576 |
645 |
- "${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch |
646 |
- |
647 |
- # bug #745162 |
648 |
- "${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch |
649 |
- |
650 |
- # Avoid failure on missing fuzz.h when running tests |
651 |
- "${WORKDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch |
652 |
- |
653 |
- ## Upstream |
654 |
- # Fix lxml compatibility |
655 |
- "${WORKDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch |
656 |
-) |
657 |
- |
658 |
-src_unpack() { |
659 |
- local tarname=${P/_rc/-rc}.tar.gz |
660 |
- |
661 |
- if use verify-sig ; then |
662 |
- verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc} |
663 |
- fi |
664 |
- |
665 |
- # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, |
666 |
- # as they are needed as tarballs in ${S}/xstc instead and not unpacked |
667 |
- unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2 |
668 |
- |
669 |
- cd "${S}" || die |
670 |
- |
671 |
- if use test ; then |
672 |
- cp "${DISTDIR}/${XSTS_TARBALL_1}" \ |
673 |
- "${DISTDIR}/${XSTS_TARBALL_2}" \ |
674 |
- "${S}"/xstc/ \ |
675 |
- || die "Failed to install test tarballs" |
676 |
- unpack ${XMLCONF_TARBALL} |
677 |
- fi |
678 |
-} |
679 |
- |
680 |
-src_prepare() { |
681 |
- default |
682 |
- |
683 |
- eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c |
684 |
- |
685 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
686 |
- # Avoid final linking arguments for python modules |
687 |
- sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die |
688 |
- # gcc-apple doesn't grok -Wno-array-bounds |
689 |
- sed -i -e 's/-Wno-array-bounds//' configure.ac || die |
690 |
- fi |
691 |
- |
692 |
- # Please do not remove, as else we get references to PORTAGE_TMPDIR |
693 |
- # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. |
694 |
- # We now need to run eautoreconf at the end to prevent maintainer mode. |
695 |
- #elibtoolize |
696 |
- eautoreconf |
697 |
-} |
698 |
- |
699 |
-multilib_src_configure() { |
700 |
- # Filter seemingly problematic CFLAGS (#26320) |
701 |
- filter-flags -fprefetch-loop-arrays -funroll-loops |
702 |
- |
703 |
- # Notes: |
704 |
- # 1) USE zlib support breaks gnome2 |
705 |
- # (libgnomeprint for instance fails to compile with |
706 |
- # fresh install, and existing) - <azarah@g.o> (22 Dec 2002). |
707 |
- # |
708 |
- # 2) The meaning of the 'debug' USE flag does not apply to the --with-debug |
709 |
- # switch (enabling the libxml2 debug module). See bug #100898. |
710 |
- # |
711 |
- # 3) --with-mem-debug causes unusual segmentation faults (bug #105120). |
712 |
- |
713 |
- libxml2_configure() { |
714 |
- ECONF_SOURCE="${S}" econf \ |
715 |
- --with-html-subdir=${PF}/html \ |
716 |
- $(use_with debug run-debug) \ |
717 |
- $(use_with icu) \ |
718 |
- $(use_with lzma) \ |
719 |
- $(use_enable ipv6) \ |
720 |
- $(use_enable static-libs static) \ |
721 |
- $(multilib_native_use_with readline) \ |
722 |
- $(multilib_native_use_with readline history) \ |
723 |
- "$@" |
724 |
- } |
725 |
- |
726 |
- libxml2_py_configure() { |
727 |
- # Ensure python build dirs exist |
728 |
- mkdir -p "${BUILD_DIR}" || die |
729 |
- |
730 |
- # Odd build system, also see bug #582130 |
731 |
- run_in_build_dir libxml2_configure \ |
732 |
- "--with-python=${EPYTHON}" \ |
733 |
- "--with-python-install-dir=$(python_get_sitedir)" |
734 |
- } |
735 |
- |
736 |
- # Build python bindings separately |
737 |
- libxml2_configure --without-python |
738 |
- |
739 |
- if multilib_is_native_abi && use python ; then |
740 |
- python_foreach_impl libxml2_py_configure |
741 |
- fi |
742 |
-} |
743 |
- |
744 |
-libxml2_py_emake() { |
745 |
- pushd "${BUILD_DIR}/python" > /dev/null || die |
746 |
- |
747 |
- emake "$@" |
748 |
- |
749 |
- popd > /dev/null || die |
750 |
-} |
751 |
- |
752 |
-multilib_src_compile() { |
753 |
- default |
754 |
- |
755 |
- if multilib_is_native_abi && use python ; then |
756 |
- local native_builddir="${BUILD_DIR}" |
757 |
- |
758 |
- python_foreach_impl libxml2_py_emake \ |
759 |
- top_builddir="${native_builddir}" \ |
760 |
- all |
761 |
- fi |
762 |
-} |
763 |
- |
764 |
-multilib_src_test() { |
765 |
- ln -s "${S}"/xmlconf || die |
766 |
- |
767 |
- emake check |
768 |
- |
769 |
- if multilib_is_native_abi && use python ; then |
770 |
- python_foreach_impl libxml2_py_emake test |
771 |
- fi |
772 |
-} |
773 |
- |
774 |
-multilib_src_install() { |
775 |
- emake \ |
776 |
- DESTDIR="${D}" \ |
777 |
- EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \ |
778 |
- install |
779 |
- |
780 |
- if multilib_is_native_abi && use python ; then |
781 |
- python_foreach_impl libxml2_py_emake \ |
782 |
- DESTDIR="${D}" \ |
783 |
- docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ |
784 |
- exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ |
785 |
- install |
786 |
- |
787 |
- python_foreach_impl python_optimize |
788 |
- fi |
789 |
-} |
790 |
- |
791 |
-multilib_src_install_all() { |
792 |
- rm -rf "${ED}"/usr/share/doc/${P} |
793 |
- |
794 |
- einstalldocs |
795 |
- |
796 |
- if ! use examples ; then |
797 |
- rm -rf "${ED}"/usr/share/doc/${PF}/examples |
798 |
- rm -rf "${ED}"/usr/share/doc/${PF}/python/examples |
799 |
- fi |
800 |
- |
801 |
- find "${D}" -name '*.la' -delete || die |
802 |
-} |
803 |
- |
804 |
-pkg_postinst() { |
805 |
- # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not |
806 |
- # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. |
807 |
- if [[ -n "${ROOT}" ]]; then |
808 |
- elog "Skipping XML catalog creation for stage building (bug #208887)." |
809 |
- else |
810 |
- # Need an XML catalog, so no-one writes to a non-existent one |
811 |
- CATALOG="${EROOT}/etc/xml/catalog" |
812 |
- |
813 |
- # We don't want to clobber an existing catalog though, |
814 |
- # only ensure that one is there |
815 |
- # <obz@g.o> |
816 |
- if [[ ! -e "${CATALOG}" ]]; then |
817 |
- [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" |
818 |
- "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" |
819 |
- einfo "Created XML catalog in ${CATALOG}" |
820 |
- fi |
821 |
- fi |
822 |
-} |
823 |
|
824 |
diff --git a/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild b/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild |
825 |
deleted file mode 100644 |
826 |
index 7d87a16e154..00000000000 |
827 |
--- a/dev-libs/libxml2/libxml2-2.9.12-r3.ebuild |
828 |
+++ /dev/null |
829 |
@@ -1,251 +0,0 @@ |
830 |
-# Copyright 1999-2021 Gentoo Authors |
831 |
-# Distributed under the terms of the GNU General Public License v2 |
832 |
- |
833 |
-EAPI=7 |
834 |
- |
835 |
-# Note: Please bump in sync with dev-libs/libxslt |
836 |
- |
837 |
-PATCHSET_VERSION="2.9.12-r3-patchset" |
838 |
- |
839 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
840 |
-PYTHON_REQ_USE="xml" |
841 |
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/danielveillard.asc |
842 |
-inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig |
843 |
- |
844 |
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" |
845 |
-XSTS_NAME_1="xmlschema2002-01-16" |
846 |
-XSTS_NAME_2="xmlschema2004-01-14" |
847 |
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" |
848 |
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" |
849 |
-XMLCONF_TARBALL="xmlts20130923.tar.gz" |
850 |
-DESCRIPTION="XML C parser and toolkit" |
851 |
-HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" |
852 |
-SRC_URI=" |
853 |
- ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz |
854 |
- https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2 |
855 |
- test? ( |
856 |
- ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} |
857 |
- ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} |
858 |
- https://www.w3.org/XML/Test/${XMLCONF_TARBALL} |
859 |
- ) |
860 |
- verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc ) |
861 |
-" |
862 |
-S="${WORKDIR}/${PN}-${PV%_rc*}" |
863 |
- |
864 |
-LICENSE="MIT" |
865 |
-SLOT="2" |
866 |
-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" |
867 |
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test" |
868 |
-RESTRICT="!test? ( test )" |
869 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
870 |
- |
871 |
-BDEPEND=" |
872 |
- dev-util/gtk-doc-am |
873 |
- virtual/pkgconfig |
874 |
- verify-sig? ( app-crypt/openpgp-keys-danielveillard ) |
875 |
-" |
876 |
-RDEPEND=" |
877 |
- >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] |
878 |
- icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) |
879 |
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) |
880 |
- python? ( ${PYTHON_DEPS} ) |
881 |
- readline? ( sys-libs/readline:= ) |
882 |
-" |
883 |
-DEPEND="${RDEPEND}" |
884 |
- |
885 |
-MULTILIB_CHOST_TOOLS=( |
886 |
- /usr/bin/xml2-config |
887 |
-) |
888 |
- |
889 |
-DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS ) |
890 |
- |
891 |
-PATCHES=( |
892 |
- ## Gentoo |
893 |
- # Patches needed for prefix support |
894 |
- "${WORKDIR}"/${PN}-2.7.1-catalog_path.patch |
895 |
- |
896 |
- # Fix python detection, bug #567066 |
897 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=760458 |
898 |
- "${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch |
899 |
- |
900 |
- # Fix python tests when building out of tree #565576 |
901 |
- "${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch |
902 |
- |
903 |
- # bug #745162 |
904 |
- "${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch |
905 |
- |
906 |
- # Avoid failure on missing fuzz.h when running tests |
907 |
- "${WORKDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch |
908 |
- |
909 |
- ## Upstream |
910 |
- # Fix lxml compatibility (bug #790737) |
911 |
- "${WORKDIR}"/${PN}-2.9.12-fix-lxml-compatibility.patch |
912 |
- # Fix serialising empty HTML documents (bug #794733) |
913 |
- "${WORKDIR}"/${PN}-2.9.12-Fix-whitespace-when-serializing-empty-HTML-documents.patch |
914 |
-) |
915 |
- |
916 |
-src_unpack() { |
917 |
- local tarname=${P/_rc/-rc}.tar.gz |
918 |
- |
919 |
- if use verify-sig ; then |
920 |
- verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc} |
921 |
- fi |
922 |
- |
923 |
- # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, |
924 |
- # as they are needed as tarballs in ${S}/xstc instead and not unpacked |
925 |
- unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2 |
926 |
- |
927 |
- cd "${S}" || die |
928 |
- |
929 |
- if use test ; then |
930 |
- cp "${DISTDIR}/${XSTS_TARBALL_1}" \ |
931 |
- "${DISTDIR}/${XSTS_TARBALL_2}" \ |
932 |
- "${S}"/xstc/ \ |
933 |
- || die "Failed to install test tarballs" |
934 |
- unpack ${XMLCONF_TARBALL} |
935 |
- fi |
936 |
-} |
937 |
- |
938 |
-src_prepare() { |
939 |
- default |
940 |
- |
941 |
- eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c |
942 |
- |
943 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
944 |
- # Avoid final linking arguments for python modules |
945 |
- sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die |
946 |
- # gcc-apple doesn't grok -Wno-array-bounds |
947 |
- sed -i -e 's/-Wno-array-bounds//' configure.ac || die |
948 |
- fi |
949 |
- |
950 |
- # Please do not remove, as else we get references to PORTAGE_TMPDIR |
951 |
- # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. |
952 |
- # We now need to run eautoreconf at the end to prevent maintainer mode. |
953 |
- #elibtoolize |
954 |
- eautoreconf |
955 |
-} |
956 |
- |
957 |
-multilib_src_configure() { |
958 |
- # Filter seemingly problematic CFLAGS (#26320) |
959 |
- filter-flags -fprefetch-loop-arrays -funroll-loops |
960 |
- |
961 |
- # Notes: |
962 |
- # 1) USE zlib support breaks gnome2 |
963 |
- # (libgnomeprint for instance fails to compile with |
964 |
- # fresh install, and existing) - <azarah@g.o> (22 Dec 2002). |
965 |
- # |
966 |
- # 2) The meaning of the 'debug' USE flag does not apply to the --with-debug |
967 |
- # switch (enabling the libxml2 debug module). See bug #100898. |
968 |
- # |
969 |
- # 3) --with-mem-debug causes unusual segmentation faults (bug #105120). |
970 |
- |
971 |
- libxml2_configure() { |
972 |
- ECONF_SOURCE="${S}" econf \ |
973 |
- --with-html-subdir=${PF}/html \ |
974 |
- $(use_with debug run-debug) \ |
975 |
- $(use_with icu) \ |
976 |
- $(use_with lzma) \ |
977 |
- $(use_enable ipv6) \ |
978 |
- $(use_enable static-libs static) \ |
979 |
- $(multilib_native_use_with readline) \ |
980 |
- $(multilib_native_use_with readline history) \ |
981 |
- "$@" |
982 |
- } |
983 |
- |
984 |
- libxml2_py_configure() { |
985 |
- # Ensure python build dirs exist |
986 |
- mkdir -p "${BUILD_DIR}" || die |
987 |
- |
988 |
- # Odd build system, also see bug #582130 |
989 |
- run_in_build_dir libxml2_configure \ |
990 |
- "--with-python=${EPYTHON}" \ |
991 |
- "--with-python-install-dir=$(python_get_sitedir)" |
992 |
- } |
993 |
- |
994 |
- # Build python bindings separately |
995 |
- libxml2_configure --without-python |
996 |
- |
997 |
- if multilib_is_native_abi && use python ; then |
998 |
- python_foreach_impl libxml2_py_configure |
999 |
- fi |
1000 |
-} |
1001 |
- |
1002 |
-libxml2_py_emake() { |
1003 |
- pushd "${BUILD_DIR}/python" > /dev/null || die |
1004 |
- |
1005 |
- emake "$@" |
1006 |
- |
1007 |
- popd > /dev/null || die |
1008 |
-} |
1009 |
- |
1010 |
-multilib_src_compile() { |
1011 |
- default |
1012 |
- |
1013 |
- if multilib_is_native_abi && use python ; then |
1014 |
- local native_builddir="${BUILD_DIR}" |
1015 |
- |
1016 |
- python_foreach_impl libxml2_py_emake \ |
1017 |
- top_builddir="${native_builddir}" \ |
1018 |
- all |
1019 |
- fi |
1020 |
-} |
1021 |
- |
1022 |
-multilib_src_test() { |
1023 |
- ln -s "${S}"/xmlconf || die |
1024 |
- |
1025 |
- emake check |
1026 |
- |
1027 |
- if multilib_is_native_abi && use python ; then |
1028 |
- python_foreach_impl libxml2_py_emake test |
1029 |
- fi |
1030 |
-} |
1031 |
- |
1032 |
-multilib_src_install() { |
1033 |
- emake \ |
1034 |
- DESTDIR="${D}" \ |
1035 |
- EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \ |
1036 |
- install |
1037 |
- |
1038 |
- if multilib_is_native_abi && use python ; then |
1039 |
- python_foreach_impl libxml2_py_emake \ |
1040 |
- DESTDIR="${D}" \ |
1041 |
- docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ |
1042 |
- exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ |
1043 |
- install |
1044 |
- |
1045 |
- python_foreach_impl python_optimize |
1046 |
- fi |
1047 |
-} |
1048 |
- |
1049 |
-multilib_src_install_all() { |
1050 |
- rm -rf "${ED}"/usr/share/doc/${P} |
1051 |
- |
1052 |
- einstalldocs |
1053 |
- |
1054 |
- if ! use examples ; then |
1055 |
- rm -rf "${ED}"/usr/share/doc/${PF}/examples |
1056 |
- rm -rf "${ED}"/usr/share/doc/${PF}/python/examples |
1057 |
- fi |
1058 |
- |
1059 |
- find "${D}" -name '*.la' -delete || die |
1060 |
-} |
1061 |
- |
1062 |
-pkg_postinst() { |
1063 |
- # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not |
1064 |
- # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. |
1065 |
- if [[ -n "${ROOT}" ]]; then |
1066 |
- elog "Skipping XML catalog creation for stage building (bug #208887)." |
1067 |
- else |
1068 |
- # Need an XML catalog, so no-one writes to a non-existent one |
1069 |
- CATALOG="${EROOT}/etc/xml/catalog" |
1070 |
- |
1071 |
- # We don't want to clobber an existing catalog though, |
1072 |
- # only ensure that one is there |
1073 |
- # <obz@g.o> |
1074 |
- if [[ ! -e "${CATALOG}" ]]; then |
1075 |
- [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" |
1076 |
- "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" |
1077 |
- einfo "Created XML catalog in ${CATALOG}" |
1078 |
- fi |
1079 |
- fi |
1080 |
-} |
1081 |
|
1082 |
diff --git a/dev-libs/libxml2/libxml2-2.9.12.ebuild b/dev-libs/libxml2/libxml2-2.9.12.ebuild |
1083 |
deleted file mode 100644 |
1084 |
index 75db7e79251..00000000000 |
1085 |
--- a/dev-libs/libxml2/libxml2-2.9.12.ebuild |
1086 |
+++ /dev/null |
1087 |
@@ -1,240 +0,0 @@ |
1088 |
-# Copyright 1999-2021 Gentoo Authors |
1089 |
-# Distributed under the terms of the GNU General Public License v2 |
1090 |
- |
1091 |
-EAPI=7 |
1092 |
- |
1093 |
-# Note: Please bump in sync with dev-libs/libxslt |
1094 |
- |
1095 |
-PYTHON_COMPAT=( python3_{7,8,9} ) |
1096 |
-PYTHON_REQ_USE="xml" |
1097 |
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/danielveillard.asc |
1098 |
-inherit autotools flag-o-matic prefix python-r1 multilib-minimal verify-sig |
1099 |
- |
1100 |
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" |
1101 |
-XSTS_NAME_1="xmlschema2002-01-16" |
1102 |
-XSTS_NAME_2="xmlschema2004-01-14" |
1103 |
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" |
1104 |
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" |
1105 |
-XMLCONF_TARBALL="xmlts20130923.tar.gz" |
1106 |
-DESCRIPTION="XML C parser and toolkit" |
1107 |
-HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2" |
1108 |
-SRC_URI=" |
1109 |
- ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz |
1110 |
- test? ( |
1111 |
- ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} |
1112 |
- ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} |
1113 |
- https://www.w3.org/XML/Test/${XMLCONF_TARBALL} |
1114 |
- ) |
1115 |
- verify-sig? ( ftp://xmlsoft.org/${PN}/${PN}-${PV/_rc/-rc}.tar.gz.asc ) |
1116 |
-" |
1117 |
-S="${WORKDIR}/${PN}-${PV%_rc*}" |
1118 |
- |
1119 |
-LICENSE="MIT" |
1120 |
-SLOT="2" |
1121 |
-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" |
1122 |
-IUSE="debug examples icu ipv6 lzma +python readline static-libs test" |
1123 |
-RESTRICT="!test? ( test )" |
1124 |
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
1125 |
- |
1126 |
-BDEPEND=" |
1127 |
- dev-util/gtk-doc-am |
1128 |
- virtual/pkgconfig |
1129 |
- verify-sig? ( app-crypt/openpgp-keys-danielveillard ) |
1130 |
-" |
1131 |
-RDEPEND=" |
1132 |
- >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] |
1133 |
- icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) |
1134 |
- lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) |
1135 |
- python? ( ${PYTHON_DEPS} ) |
1136 |
- readline? ( sys-libs/readline:= ) |
1137 |
-" |
1138 |
-DEPEND="${RDEPEND}" |
1139 |
- |
1140 |
-MULTILIB_CHOST_TOOLS=( |
1141 |
- /usr/bin/xml2-config |
1142 |
-) |
1143 |
- |
1144 |
-DOCS=( AUTHORS ChangeLog NEWS README TODO TODO_SCHEMAS ) |
1145 |
- |
1146 |
-PATCHES=( |
1147 |
- # Patches needed for prefix support |
1148 |
- "${FILESDIR}"/${PN}-2.7.1-catalog_path.patch |
1149 |
- |
1150 |
- # Fix python detection, bug #567066 |
1151 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=760458 |
1152 |
- "${FILESDIR}"/${PN}-2.9.2-python-ABIFLAG.patch |
1153 |
- |
1154 |
- # Fix python tests when building out of tree #565576 |
1155 |
- "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch |
1156 |
- |
1157 |
- # bug #745162 |
1158 |
- "${FILESDIR}"/${PN}-2.9.8-python3-unicode-errors.patch |
1159 |
- |
1160 |
- # Avoid failure on missing fuzz.h when running tests |
1161 |
- "${FILESDIR}"/${PN}-2.9.11-disable-fuzz-tests.patch |
1162 |
-) |
1163 |
- |
1164 |
-src_unpack() { |
1165 |
- local tarname=${P/_rc/-rc}.tar.gz |
1166 |
- |
1167 |
- if use verify-sig ; then |
1168 |
- verify-sig_verify_detached "${DISTDIR}"/${tarname}{,.asc} |
1169 |
- fi |
1170 |
- |
1171 |
- # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, |
1172 |
- # as they are needed as tarballs in ${S}/xstc instead and not unpacked |
1173 |
- unpack ${tarname} |
1174 |
- cd "${S}" || die |
1175 |
- |
1176 |
- if use test ; then |
1177 |
- cp "${DISTDIR}/${XSTS_TARBALL_1}" \ |
1178 |
- "${DISTDIR}/${XSTS_TARBALL_2}" \ |
1179 |
- "${S}"/xstc/ \ |
1180 |
- || die "Failed to install test tarballs" |
1181 |
- unpack ${XMLCONF_TARBALL} |
1182 |
- fi |
1183 |
-} |
1184 |
- |
1185 |
-src_prepare() { |
1186 |
- default |
1187 |
- |
1188 |
- eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c |
1189 |
- |
1190 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
1191 |
- # Avoid final linking arguments for python modules |
1192 |
- sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die |
1193 |
- # gcc-apple doesn't grok -Wno-array-bounds |
1194 |
- sed -i -e 's/-Wno-array-bounds//' configure.ac || die |
1195 |
- fi |
1196 |
- |
1197 |
- # Please do not remove, as else we get references to PORTAGE_TMPDIR |
1198 |
- # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. |
1199 |
- # We now need to run eautoreconf at the end to prevent maintainer mode. |
1200 |
- #elibtoolize |
1201 |
- eautoreconf |
1202 |
-} |
1203 |
- |
1204 |
-multilib_src_configure() { |
1205 |
- # Filter seemingly problematic CFLAGS (#26320) |
1206 |
- filter-flags -fprefetch-loop-arrays -funroll-loops |
1207 |
- |
1208 |
- # Notes: |
1209 |
- # 1) USE zlib support breaks gnome2 |
1210 |
- # (libgnomeprint for instance fails to compile with |
1211 |
- # fresh install, and existing) - <azarah@g.o> (22 Dec 2002). |
1212 |
- # |
1213 |
- # 2) The meaning of the 'debug' USE flag does not apply to the --with-debug |
1214 |
- # switch (enabling the libxml2 debug module). See bug #100898. |
1215 |
- # |
1216 |
- # 3) --with-mem-debug causes unusual segmentation faults (bug #105120). |
1217 |
- |
1218 |
- libxml2_configure() { |
1219 |
- ECONF_SOURCE="${S}" econf \ |
1220 |
- --with-html-subdir=${PF}/html \ |
1221 |
- $(use_with debug run-debug) \ |
1222 |
- $(use_with icu) \ |
1223 |
- $(use_with lzma) \ |
1224 |
- $(use_enable ipv6) \ |
1225 |
- $(use_enable static-libs static) \ |
1226 |
- $(multilib_native_use_with readline) \ |
1227 |
- $(multilib_native_use_with readline history) \ |
1228 |
- "$@" |
1229 |
- } |
1230 |
- |
1231 |
- libxml2_py_configure() { |
1232 |
- # Ensure python build dirs exist |
1233 |
- mkdir -p "${BUILD_DIR}" || die |
1234 |
- |
1235 |
- # Odd build system, also see bug #582130 |
1236 |
- run_in_build_dir libxml2_configure \ |
1237 |
- "--with-python=${EPYTHON}" \ |
1238 |
- "--with-python-install-dir=$(python_get_sitedir)" |
1239 |
- } |
1240 |
- |
1241 |
- # Build python bindings separately |
1242 |
- libxml2_configure --without-python |
1243 |
- |
1244 |
- if multilib_is_native_abi && use python ; then |
1245 |
- python_foreach_impl libxml2_py_configure |
1246 |
- fi |
1247 |
-} |
1248 |
- |
1249 |
-libxml2_py_emake() { |
1250 |
- pushd "${BUILD_DIR}/python" > /dev/null || die |
1251 |
- |
1252 |
- emake "$@" |
1253 |
- |
1254 |
- popd > /dev/null || die |
1255 |
-} |
1256 |
- |
1257 |
-multilib_src_compile() { |
1258 |
- default |
1259 |
- |
1260 |
- if multilib_is_native_abi && use python ; then |
1261 |
- local native_builddir="${BUILD_DIR}" |
1262 |
- |
1263 |
- python_foreach_impl libxml2_py_emake \ |
1264 |
- top_builddir="${native_builddir}" \ |
1265 |
- all |
1266 |
- fi |
1267 |
-} |
1268 |
- |
1269 |
-multilib_src_test() { |
1270 |
- ln -s "${S}"/xmlconf || die |
1271 |
- |
1272 |
- emake check |
1273 |
- |
1274 |
- if multilib_is_native_abi && use python ; then |
1275 |
- python_foreach_impl libxml2_py_emake test |
1276 |
- fi |
1277 |
-} |
1278 |
- |
1279 |
-multilib_src_install() { |
1280 |
- emake \ |
1281 |
- DESTDIR="${D}" \ |
1282 |
- EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \ |
1283 |
- install |
1284 |
- |
1285 |
- if multilib_is_native_abi && use python ; then |
1286 |
- python_foreach_impl libxml2_py_emake \ |
1287 |
- DESTDIR="${D}" \ |
1288 |
- docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ |
1289 |
- exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ |
1290 |
- install |
1291 |
- |
1292 |
- python_foreach_impl python_optimize |
1293 |
- fi |
1294 |
-} |
1295 |
- |
1296 |
-multilib_src_install_all() { |
1297 |
- rm -rf "${ED}"/usr/share/doc/${P} |
1298 |
- |
1299 |
- einstalldocs |
1300 |
- |
1301 |
- if ! use examples ; then |
1302 |
- rm -rf "${ED}"/usr/share/doc/${PF}/examples |
1303 |
- rm -rf "${ED}"/usr/share/doc/${PF}/python/examples |
1304 |
- fi |
1305 |
- |
1306 |
- find "${D}" -name '*.la' -delete || die |
1307 |
-} |
1308 |
- |
1309 |
-pkg_postinst() { |
1310 |
- # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not |
1311 |
- # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. |
1312 |
- if [[ -n "${ROOT}" ]]; then |
1313 |
- elog "Skipping XML catalog creation for stage building (bug #208887)." |
1314 |
- else |
1315 |
- # Need an XML catalog, so no-one writes to a non-existent one |
1316 |
- CATALOG="${EROOT}/etc/xml/catalog" |
1317 |
- |
1318 |
- # We don't want to clobber an existing catalog though, |
1319 |
- # only ensure that one is there |
1320 |
- # <obz@g.o> |
1321 |
- if [[ ! -e "${CATALOG}" ]]; then |
1322 |
- [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" |
1323 |
- "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" |
1324 |
- einfo "Created XML catalog in ${CATALOG}" |
1325 |
- fi |
1326 |
- fi |
1327 |
-} |