commit: bd5a0b95ae41eb02bc2e3b27b358e96b75f98822 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Aug 18 01:43:38 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Aug 18 03:09:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd5a0b95
dev-libs/libxml2: add 2.10.0 Bug: https://bugs.gentoo.org/582130 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/libxml2/Manifest | 1 + .../{libxml2-9999.ebuild => libxml2-2.10.0.ebuild} | 15 ++++++++++----- dev-libs/libxml2/libxml2-9999.ebuild | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index a349aea4e127..8a1b41309525 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -1,3 +1,4 @@ +DIST libxml2-2.10.0.tar.xz 2698684 BLAKE2B 655b9241db06b98f5d33f6d02f2dbf5f998ae9a125f2c16e4d8ce3ee902d53ec14e728e7f3de2aea47b45e825b9ed78f17caffd9e4e9afbde40e1d7b1e047e7f SHA512 0a7a58414c3a4f21e9b052cc18f18032bc646f2690483bb95e37e132a3fc5789f0ec7bbc91b58497df59dbccf0e52f6e6280947762f47a035e85a316e96b1623 DIST libxml2-2.9.14-patches-r0.tar.bz2 8304 BLAKE2B 067faba5bfcbf81e2ef356925c0d3b4ef0aff7604db049366180b8217b781c60c2746be348c5e1a09de925e54fc69e3e431f7e2199ce326b6ff88ea9352ca45c SHA512 e97bada92a14ef0501a5f7be312d35d26eb52b648102d028dc11b3eef62ee0597540d0b474f54bd015a914a9cb7600d4dc34912b0ead5230136e945d80ae8428 DIST libxml2-2.9.14.tar.xz 3129968 BLAKE2B ab584503d5209e4aaf41ae6f44aed5e94c0ae29e28cfba39a9012568aa97515af861b47891b84d2a352a07357626ba50ddb1e344e911fa14ff2ce93c5beff1f1 SHA512 d08e6cafb289c499fdc5b3a12181e032a34f7a249bc66758859f964d3e71e19fd69be79921e1a9d8ab1e692d15b13f5fae95eeb10c3236974d89e218f5107606 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733 diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-2.10.0.ebuild similarity index 93% copy from dev-libs/libxml2/libxml2-9999.ebuild copy to dev-libs/libxml2/libxml2-2.10.0.ebuild index d651157658dc..d9eb0d19172a 100644 --- a/dev-libs/libxml2/libxml2-9999.ebuild +++ b/dev-libs/libxml2/libxml2-2.10.0.ebuild @@ -7,7 +7,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{8..11} ) PYTHON_REQ_USE="xml(+)" -inherit flag-o-matic python-r1 multilib-minimal +inherit autotools flag-o-matic python-r1 multilib-minimal XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"; XSTS_NAME_1="xmlschema2002-01-16" @@ -20,9 +20,9 @@ DESCRIPTION="XML C parser and toolkit" HOMEPAGE="http://www.xmlsoft.org/ https://gitlab.gnome.org/GNOME/libxml2"; if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxml2"; - inherit autotools git-r3 + inherit git-r3 #autotools else - inherit gnome.org libtool + inherit gnome.org #libtool KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi @@ -92,7 +92,12 @@ src_prepare() { else # Please do not remove, as else we get references to PORTAGE_TMPDIR # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - elibtoolize + #elibtoolize + + # Temporarily for Python 3.10 fix (version used for + # dist tarballs fails w/ "3.1" error) + # See https://gitlab.gnome.org/GNOME/libxml2/-/issues/392. + eautoreconf fi } @@ -145,7 +150,7 @@ multilib_src_test() { emake check multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_py_emake test + python_foreach_impl run_in_build_dir libxml2_py_emake check } multilib_src_install() { diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild index d651157658dc..0fe269e46054 100644 --- a/dev-libs/libxml2/libxml2-9999.ebuild +++ b/dev-libs/libxml2/libxml2-9999.ebuild @@ -145,7 +145,7 @@ multilib_src_test() { emake check multilib_is_native_abi && use python && - python_foreach_impl run_in_build_dir libxml2_py_emake test + python_foreach_impl run_in_build_dir libxml2_py_emake check } multilib_src_install() {
