[gentoo-commits] repo/gentoo:master commit in: dev-libs/libxslt/files/, dev-libs/libxslt/
commit: e06a4aed9969ad025d82fadde2da1f4f7b98d2fd Author: Sam James gentoo org> AuthorDate: Sun Apr 17 16:34:42 2022 + Commit: Sam James gentoo org> CommitDate: Sun Apr 17 16:34:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e06a4aed dev-libs/libxslt: drop 1.1.34-r2 Signed-off-by: Sam James gentoo.org> dev-libs/libxslt/Manifest | 2 - .../files/libxslt-1.1.34-CVE-2021-30560.patch | 194 - .../files/libxslt-1.1.34-libxml2-2.9.12.patch | 120 - dev-libs/libxslt/libxslt-1.1.34-r2.ebuild | 72 4 files changed, 388 deletions(-) diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest index 4a8fc6108e27..e925f79f8190 100644 --- a/dev-libs/libxslt/Manifest +++ b/dev-libs/libxslt/Manifest @@ -1,3 +1 @@ -DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b9de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b -DIST libxslt-1.1.34.tar.gz.asc 488 BLAKE2B fff407ab2c2bbafa804e5a1f84ca447c706d75fd7489c99ac6040b625d0417a0e6c189be3457e6cc6ecd6b7860829875ea95a132fef24f8a532156361f8a5308 SHA512 9b155d4571daede99cdbf2813a85fb04812737b5e23d3f7c9840225b38f3dbf171623a21645daaee190e7ff9ba38bde932922e96a2a2312c203ffa9917c3baea DIST libxslt-1.1.35.tar.xz 1827548 BLAKE2B 9667a93e61f50098a512c1351bce2ee937fc5d29488d010b525122d28ffedc73e0930402f3df2d378161a031dc016a15f0f03bdc343f0c4aa5d0b5c454f8002d SHA512 9dd4a699235f50ae9b75b25137e387471635b4b2da0a4e4380879cd49f1513470fcfbfd775269b066eac513a1ffa6860c77ec42747168e2348248f09f60c8c96 diff --git a/dev-libs/libxslt/files/libxslt-1.1.34-CVE-2021-30560.patch b/dev-libs/libxslt/files/libxslt-1.1.34-CVE-2021-30560.patch deleted file mode 100644 index dcda176c513a.. --- a/dev-libs/libxslt/files/libxslt-1.1.34-CVE-2021-30560.patch +++ /dev/null @@ -1,194 +0,0 @@ -https://gitlab.gnome.org/GNOME/libxslt/-/issues/56 -https://gitlab.gnome.org/GNOME/libxslt/-/commit/50f9c9cd3b7dfe9b3c8c795247752d1fdcadcac8 -https://gitlab.gnome.org/GNOME/libxslt/-/issues/51 -https://bugs.gentoo.org/790218 - -From: Nick Wellnhofer -Date: Sat, 12 Jun 2021 20:02:53 +0200 -Subject: [PATCH] Fix use-after-free in xsltApplyTemplates - -xsltApplyTemplates without a select expression could delete nodes in -the source document. - -1. Text nodes with strippable whitespace - -Whitespace from input documents is already stripped, so there's no -need to strip it again. Under certain circumstances, xsltApplyTemplates -could be fooled into deleting text nodes that are still referenced, -resulting in a use-after-free. - -2. The DTD - -The DTD was only unlinked, but there's no good reason to do this just -now. Maybe it was meant as a micro-optimization. - -3. Unknown nodes - -Useless and dangerous as well, especially with XInclude nodes. -See https://gitlab.gnome.org/GNOME/libxml2/-/issues/268 - -Simply stop trying to uselessly delete nodes when applying a template. -This part of the code is probably a leftover from a time where -xsltApplyStripSpaces wasn't implemented yet. Also note that -xsltApplyTemplates with a select expression never tried to delete -nodes. - -Also stop xsltDefaultProcessOneNode from deleting nodes for the same -reasons. - -This fixes CVE-2021-30560. a/libxslt/transform.c -+++ b/libxslt/transform.c -@@ -1895,7 +1895,7 @@ static void - xsltDefaultProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr node, - xsltStackElemPtr params) { - xmlNodePtr copy; --xmlNodePtr delete = NULL, cur; -+xmlNodePtr cur; - int nbchild = 0, oldSize; - int childno = 0, oldPos; - xsltTemplatePtr template; -@@ -1968,54 +1968,13 @@ xsltDefaultProcessOneNode(xsltTransformContextPtr ctxt, xmlNodePtr node, - return; - } - /* -- * Handling of Elements: first pass, cleanup and counting -+ * Handling of Elements: first pass, counting - */ - cur = node->children; - while (cur != NULL) { -- switch (cur->type) { -- case XML_TEXT_NODE: -- case XML_CDATA_SECTION_NODE: -- case XML_DOCUMENT_NODE: -- case XML_HTML_DOCUMENT_NODE: -- case XML_ELEMENT_NODE: -- case XML_PI_NODE: -- case XML_COMMENT_NODE: -- nbchild++; -- break; --case XML_DTD_NODE: -- /* Unlink the DTD, it's still reachable using doc->intSubset */ -- if (cur->next != NULL) -- cur->next->prev = cur->prev; -- if (cur->prev != NULL) -- cur->prev->next = cur->next; -- break; -- default: --#ifdef WITH_XSLT_DEBUG_PROCESS -- XSLT_TRACE(ctxt,XSLT_TRACE_PROCESS_NODE,xsltGenericDebug(xsltGenericDebugContext, --
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libxslt/files/, dev-libs/libxslt/
commit: 239dd8d12a0181dc4a9b162a96deef14aa7889b7 Author: Sam James gentoo org> AuthorDate: Sat Jun 27 08:34:22 2020 + Commit: Matt Turner gentoo org> CommitDate: Wed Jul 29 20:55:19 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=239dd8d1 dev-libs/libxslt: security bump to 1.1.34 Note that we need the new dev-libs/libxml-2.9.10:2 in order for tests to build successfully. Let's require it in general because upstream may have written their code expecting other properties which didn't show up during testing. Bug: https://bugs.gentoo.org/700386 Closes: https://bugs.gentoo.org/703274 Signed-off-by: Sam James gentoo.org> Signed-off-by: Matt Turner gentoo.org> dev-libs/libxslt/Manifest | 1 + .../files/libxslt-1.1.34-simplify-python.patch | 239 + dev-libs/libxslt/libxslt-1.1.34.ebuild | 125 +++ 3 files changed, 365 insertions(+) diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest index 83895cac52e..c2c9495a149 100644 --- a/dev-libs/libxslt/Manifest +++ b/dev-libs/libxslt/Manifest @@ -1,2 +1,3 @@ DIST libxslt-1.1.33-CVE-2019-11068.patch 3965 BLAKE2B eb3a0741ac9f464e31e8edd276fec4d837c63676a56a446ad42a0e251508bacb0129cbe18783de305336eaa32b189ffc23e95e03cfd5f940d4dee376f1fa0f8c SHA512 9a97c5038809aaf64cb4eb7d67b95acc4b62236d7613a5f753e2a0f4c9e707c22cd07bda2e518d3f36a40b9ed5aa93496b743998c7adadb84ca147e045e35948 DIST libxslt-1.1.33.tar.gz 3444093 BLAKE2B 3457e5b62328ccbc48fbc5f71bf8a54c195c0059dd18afa38e6916e74c57e72601970446210c7584d5410b956e3bbb8cd4b852ec71e0a13c4441e6de095d86d1 SHA512 ebbe438a38bf6355950167d3b580edc22baa46a77068c18c42445c1c9c716d42bed3b30c5cd5bec359ab32d03843224dae458e9e32dc61693e7cf4bab23536e0 +DIST libxslt-1.1.34.tar.gz 3552258 BLAKE2B f043a0357e0705ab68041adf4031a6b3e0b5c3d396691c988a34963a0ee0ebe3bede2d1d7a0c5f0c42c046183653c94f4b51e10e35980a039c8cad446e84ad86 SHA512 1516a11ad608b04740674060d2c5d733b9de5e413b9a4e8bf8d1a90d712149df6d2b1345b615f529d7c7d3fa6dae12e544da828b39c7d415e54c0ee0776b diff --git a/dev-libs/libxslt/files/libxslt-1.1.34-simplify-python.patch b/dev-libs/libxslt/files/libxslt-1.1.34-simplify-python.patch new file mode 100644 index 000..ff7e263aca4 --- /dev/null +++ b/dev-libs/libxslt/files/libxslt-1.1.34-simplify-python.patch @@ -0,0 +1,239 @@ +From aa0f7a8d59a9bbd646203d3f14e39e217961f725 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue +Date: Wed, 11 Nov 2015 17:49:07 +0100 +Subject: [PATCH] Simplify python setup in autoconf + +AM_PATH_PYTHON does most of the job without using pkg-config as expected +from the rest of the autoconf script. +diff --git a/Makefile.am b/Makefile.am +index 2c417d0..a65a2b7 100644 +--- a/Makefile.am b/Makefile.am +@@ -2,9 +2,14 @@ SUBDIRS = \ + libxslt \ + libexslt \ + xsltproc \ +- doc \ +- $(PYTHON_SUBDIR) \ +- tests ++ doc ++ ++ ++if WITH_PYTHON ++ SUBDIRS += python ++endif ++ ++SUBDIRS += tests + + DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests + +@@ -52,7 +57,9 @@ tests: dummy + @echo '## Running the regression test suite' + @(cd tests ; $(MAKE) -s tests) + @(cd xsltproc ; $(MAKE) -s tests) +- @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) -s tests ; fi) ++if WITH_PYTHON ++ @(cd python ; $(MAKE) -s tests) ++endif + + valgrind: + @echo '## Running the regression tests under Valgrind' +diff --git a/configure.ac b/configure.ac +index 325a7be..ee1eabd 100644 +--- a/configure.ac b/configure.ac +@@ -227,90 +227,37 @@ dnl + dnl check for python + dnl + +-PYTHON_VERSION= +-PYTHON_INCLUDES= +-PYTHON_SITE_PACKAGES= +-pythondir= +-AC_ARG_WITH(python, [ --with-python[=DIR]Build Python bindings if found]) +-if test "$with_python" != "no" ; then +-if test -x "$with_python/bin/python" +-then +-echo Found python in $with_python/bin/python +-PYTHON="$with_python/bin/python" +-else +- if test -x "$with_python" +- then +- echo Found python in $with_python +- PYTHON="$with_python" +- else +-if test -x "$PYTHON" +-then +-echo Found python in environment PYTHON=$PYTHON +-with_python=`$PYTHON -c "import sys; print sys.exec_prefix"` +- else +- AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) +- fi +- fi +-fi +-if test "$PYTHON" != "" +-then +-echo "PYTHON is pointing at $PYTHON" +-PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"` +- echo Found Python version $PYTHON_VERSION +- LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1 +-except: print 0"` +- if test "$LIBXML2_PYTHON" = "1" +- then +- echo Found libxml2-python module +- else +- echo Warning: Missing libxml2-python +-
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libxslt/files/, dev-libs/libxslt/
commit: e1b0137912c4e66c2aba2b4354fe92e733f7f7f8 Author: Sam James gentoo org> AuthorDate: Sat Jun 27 08:41:26 2020 + Commit: Matt Turner gentoo org> CommitDate: Wed Jul 29 20:55:19 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b01379 dev-libs/libxslt: rename patch Signed-off-by: Sam James gentoo.org> Signed-off-by: Matt Turner gentoo.org> 32-simplify-python.patch => libxslt-1.1.32-simplify-python.patch} | 0 dev-libs/libxslt/libxslt-1.1.33-r1.ebuild | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-libs/libxslt/files/1.1.32-simplify-python.patch b/dev-libs/libxslt/files/libxslt-1.1.32-simplify-python.patch similarity index 100% rename from dev-libs/libxslt/files/1.1.32-simplify-python.patch rename to dev-libs/libxslt/files/libxslt-1.1.32-simplify-python.patch diff --git a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild index 66a2d1b8dbd..26cde21e982 100644 --- a/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild +++ b/dev-libs/libxslt/libxslt-1.1.33-r1.ebuild @@ -43,9 +43,9 @@ src_prepare() { # Simplify python setup # https://bugzilla.gnome.org/show_bug.cgi?id=758095 - eapply "${FILESDIR}"/1.1.32-simplify-python.patch + eapply "${FILESDIR}"/${PN}-1.1.32-simplify-python.patch eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch - eapply "${DISTDIR}"/libxslt-1.1.33-CVE-2019-11068.patch + eapply "${DISTDIR}"/${PN}-1.1.33-CVE-2019-11068.patch eautoreconf # If eautoreconf'd with new autoconf, then epunt_cxx is not necessary
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libxslt/files/, dev-libs/libxslt/
commit: 6b84cea1d4bcf7efd30689dda626e31117dbca60 Author: Mart Raudsepp gentoo org> AuthorDate: Fri Mar 2 17:05:21 2018 + Commit: Mart Raudsepp gentoo org> CommitDate: Fri Mar 2 17:07:02 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b84cea1 dev-libs/libxslt: security cleanup Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-libs/libxslt/Manifest | 1 - .../files/libxslt-1.1.28-simplify-python.patch | 250 - dev-libs/libxslt/files/libxslt-1.1.29-cygwin.patch | 29 --- dev-libs/libxslt/libxslt-1.1.29-r1.ebuild | 130 --- 4 files changed, 410 deletions(-) diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest index 7c4fd3bf5ed..12817c52ce2 100644 --- a/dev-libs/libxslt/Manifest +++ b/dev-libs/libxslt/Manifest @@ -1,2 +1 @@ -DIST libxslt-1.1.29.tar.gz 3428524 BLAKE2B e37cc4a79223c2c2b78dc2bbc0bdb502e7c9ac0e5e1f6dc1ad15a14fda3c26d5c92e7354141763eeb97f489b64af99a2c7da320405b6011195a95c11705e7f2a SHA512 a1ce555a74a9dabe65e8f64bb66e27e77760fd76940d88f2d59f58dd63ca73c8ae59f3fcbd8e76c8f92ff992fb0c09328528c20ea38ccac83e63252106bf5f31 DIST libxslt-1.1.30.tar.gz 3444029 BLAKE2B 668371393a11c0c16d1549fe771fef7dea96a7208f359578b773c9e7d4c6c4accbe43500e960d58e8f2275682a839582f1f40c1bd984745b8e3944a1d9a97582 SHA512 d24e37398503b6bc29245a993738df51bf3948c4a8f052eedd7eac0a9fcff2d5b54220f37070c46f763e073c34bdb3153c9f129aa0df60c3d7cf7eadbbf15986 diff --git a/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch b/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch deleted file mode 100644 index 7cbaaf69e09..000 --- a/dev-libs/libxslt/files/libxslt-1.1.28-simplify-python.patch +++ /dev/null @@ -1,250 +0,0 @@ -From f8aeca1dca05c7053532c576add6ab4a472c5e4e Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue-Date: Wed, 11 Nov 2015 17:49:07 +0100 -Subject: [PATCH] Simplify python setup in autoconf - -AM_PATH_PYTHON does most of the job without using pkg-config as expected -from the rest of the autoconf script. - Makefile.am| 14 +-- - configure.in | 119 ++--- - python/Makefile.am | 28 - - 3 files changed, 49 insertions(+), 112 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index e357f19..c396913 100644 a/Makefile.am -+++ b/Makefile.am -@@ -2,9 +2,13 @@ SUBDIRS = \ - libxslt \ - libexslt \ - xsltproc \ -- doc \ -- $(PYTHON_SUBDIR) \ -- tests -+ doc -+ -+if WITH_PYTHON -+SUBDIRS += python -+endif -+ -+SUBDIRS += tests - - DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests - -@@ -51,7 +55,9 @@ tests: dummy - @echo '## Running the regression test suite' - @(cd tests ; $(MAKE) tests) - @(cd xsltproc ; $(MAKE) tests) -- @(if [ "$(PYTHON_SUBDIR)" != "" ] ; then cd python ; $(MAKE) tests ; fi) -+if WITH_PYTHON -+ @(cd python ; $(MAKE) tests) -+endif - - valgrind: - @echo '## Running the regression tests under Valgrind' -diff --git a/configure.in b/configure.in -index e84ad4f..102c733 100644 a/configure.in -+++ b/configure.in -@@ -291,90 +291,37 @@ dnl - dnl check for python - dnl - --PYTHON_VERSION= --PYTHON_INCLUDES= --PYTHON_SITE_PACKAGES= --pythondir= --AC_ARG_WITH(python, [ --with-python[=DIR]Build Python bindings if found]) --if test "$with_python" != "no" ; then --if test -x "$with_python/bin/python" --then --echo Found python in $with_python/bin/python --PYTHON="$with_python/bin/python" --else -- if test -x "$with_python" -- then -- echo Found python in $with_python -- PYTHON="$with_python" -- else --if test -x "$PYTHON" --then --echo Found python in environment PYTHON=$PYTHON --with_python=`$PYTHON -c "import sys; print sys.exec_prefix"` -- else -- AC_PATH_PROG(PYTHON, python python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5) -- fi -- fi --fi --if test "$PYTHON" != "" --then --echo "PYTHON is pointing at $PYTHON" --PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"` -- echo Found Python version $PYTHON_VERSION -- LIBXML2_PYTHON=`$PYTHON -c "try : import libxml2 ; print 1 --except: print 0"` -- if test "$LIBXML2_PYTHON" = "1" -- then -- echo Found libxml2-python module -- else -- echo Warning: Missing libxml2-python -- fi --fi --if test "$PYTHON_VERSION" != "" --then -- if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \ -- -d $with_python/lib/python$PYTHON_VERSION/site-packages -- then -- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION -- PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' -- else
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libxslt/files/, dev-libs/libxslt/
commit: 69d42e2e58df1596567edca2c6bc6c2bacdf89c2 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Tue Sep 12 21:50:20 2017 + Commit: Gilles Dartiguelongue gentoo org> CommitDate: Tue Sep 12 22:03:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d42e2e dev-libs/libxslt: fix xslt-config, bug #630784 Closes: https://bugs.gentoo.org/630784 Package-Manager: Portage-2.3.8, Repoman-2.3.3 .../libxslt/files/1.1.30-unbreak-xslt-config.patch | 37 ++ dev-libs/libxslt/libxslt-1.1.30-r1.ebuild | 133 + 2 files changed, 170 insertions(+) diff --git a/dev-libs/libxslt/files/1.1.30-unbreak-xslt-config.patch b/dev-libs/libxslt/files/1.1.30-unbreak-xslt-config.patch new file mode 100644 index 000..6e367f97691 --- /dev/null +++ b/dev-libs/libxslt/files/1.1.30-unbreak-xslt-config.patch @@ -0,0 +1,37 @@ +From 9608d20739b36087f0e6865cc924769d3b286188 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue+Date: Tue, 12 Sep 2017 23:44:35 +0200 +Subject: [PATCH] Move XML_CONFIG assignment to unbreak xslt-config + +Bug: https://bugs.gentoo.org/630784 +--- + configure.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index e6f649cd..49e6b6cf 100644 +--- a/configure.in b/configure.in +@@ -518,9 +518,6 @@ else + LIBXML_MANUAL_SEARCH=yes + fi + +-if test "x$LIBXML_MANUAL_SEARCH" != "xno" +-then +- + dnl + dnl where is xml2-config + dnl +@@ -534,6 +531,9 @@ else + AC_PATH_TOOL([XML_CONFIG], [xml2-config], [false]) + fi + ++if test "x$LIBXML_MANUAL_SEARCH" != "xno" ++then ++ + dnl + dnl imported from libxml2, c.f. #77827 + dnl +-- +2.14.1 + diff --git a/dev-libs/libxslt/libxslt-1.1.30-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.30-r1.ebuild new file mode 100644 index 000..739f5be1305 --- /dev/null +++ b/dev-libs/libxslt/libxslt-1.1.30-r1.ebuild @@ -0,0 +1,133 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="xml" + +inherit autotools ltprune python-r1 toolchain-funcs multilib-minimal + +DESCRIPTION="XSLT libraries and tools" +HOMEPAGE="http://www.xmlsoft.org/; +SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz; + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +IUSE="crypt debug examples python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/libxml2-2.9.1-r5:2[${MULTILIB_USEDEP}] + crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) + python? ( + ${PYTHON_DEPS} + dev-libs/libxml2:2[python,${PYTHON_USEDEP}] ) +" +DEPEND="${RDEPEND}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xslt-config +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libxslt/xsltconfig.h +) + +src_prepare() { + default + + DOCS=( AUTHORS ChangeLog FEATURES NEWS README TODO ) + + # https://bugzilla.gnome.org/show_bug.cgi?id=684621 + eapply "${FILESDIR}"/${PN}.m4-${PN}-1.1.26.patch + + # Simplify python setup + # https://bugzilla.gnome.org/show_bug.cgi?id=758095 + eapply "${FILESDIR}"/${PN}-1.1.30-simplify-python.patch + eapply "${FILESDIR}"/${PN}-1.1.28-disable-static-modules.patch + + # Fix xslt-config + # https://bugs.gentoo.org/630784 + eapply "${FILESDIR}"/1.1.30-unbreak-xslt-config.patch + + mv configure.{in,ac} || die + + eautoreconf + # If eautoreconf'd with new autoconf, then epunt_cxx is not necessary + # and it is propably otherwise too if upstream generated with new + # autoconf +# epunt_cxx + # But Prefix always needs elibtoolize if not eautoreconf'd. +# elibtoolize +} + +multilib_src_configure() { + libxslt_configure() { + ECONF_SOURCE="${S}" econf \ + --with-html-dir="${EPREFIX}"/usr/share/doc/${PF} \ + --with-html-subdir=html \ + $(use_with crypt crypto) \ + $(use_with debug) \ + $(use_with debug mem-debug) \ + $(use_enable static-libs static) \ + "$@" + } + + libxslt_py_configure() { + mkdir -p "${BUILD_DIR}" || die # ensure python build dirs exist + run_in_build_dir libxslt_configure --with-python + } + + libxslt_configure --without-python # build python bindings separately + + if multilib_is_native_abi && use python; then + python_foreach_impl libxslt_py_configure + fi +} + +multilib_src_compile() { +