From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- dev-libs/libxml2/Manifest | 9 +- .../files/libxml2-2.9.13-testapi-missing-xml.patch | 19 -- .../files/libxml2-2.9.8-out-of-tree-test.patch | 31 --- dev-libs/libxml2/libxml2-2.9.13-r1.ebuild | 250 --------------------- dev-libs/libxml2/libxml2-2.9.14-r1.ebuild | 6 +- dev-libs/libxml2/libxml2-9999.ebuild | 8 +- 6 files changed, 7 insertions(+), 316 deletions(-) delete mode 100644 dev-libs/libxml2/files/libxml2-2.9.13-testapi-missing-xml.patch delete mode 100644 dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch delete mode 100644 dev-libs/libxml2/libxml2-2.9.13-r1.ebuild (limited to 'dev-libs/libxml2') diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index fdbe9697c865..ca57cd14d5f4 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -1,13 +1,8 @@ -AUX libxml2-2.9.13-testapi-missing-xml.patch 749 BLAKE2B cfa1ea7d99eb0fb4925008d6562fb174092ab303bfd4925847e3cfe51c3edddc3fe20117d272d52b3d3fa865cde47f69578e976cf2d0e746e41edda1c5bb84c8 SHA512 40ac186658fd5eeb68d899c92dc8073210c24e770eef00e803d666b38f7c495bc9144da63d851d0059b8dfa92bdf3782f8039d892eb11901efe661b960c3d3f5 -AUX libxml2-2.9.8-out-of-tree-test.patch 1109 BLAKE2B deba11c303cb82b7c804361311a48b7a55b1fc6a5d3fb81aefe87f0b9816aabbb870c2c26b0e9e1e82b6d92330396ef1d700c9e761863028568ceccd379dc736 SHA512 f78952b61ad22731ec2e5866695388ea0ba051153990db4227f5b2e9d7fca35d0482bcb1732b5026d91ff3b8f885de513ca5f249ed359069c9b27fe81701d68c -DIST libxml2-2.9.12-r5-patchset.tar.bz2 7231 BLAKE2B d9d0d56ebccbfe234a8af04cc5343c1a02d84fbd998c2373fd48be59cf92807a9417db650a6bb6ba309e101994c4ae2b28edda7bf635c7728eb8b8047d0d3391 SHA512 b2db0fe4595c1559d9f8dc836ee6eee469191f6c490fc95d25d9fa99a544e80858894cc35b6e4a6624a38d0309800540badc929e86ef29950c1107caa4656a14 -DIST libxml2-2.9.13.tar.xz 3243336 BLAKE2B 845a8283cf1ff9fd9f7926cfe0042c042a9de5ed184520d8057f7b33312687d5ff28abdf30dd2674795d78dc80326203a907f9e22cd261805309403ecdd585f5 SHA512 fc51980cb9222bd3b5242f73d28b55fa15a80e68e52e1c45274f1eda11500ed385853209edb3b2a1f06b9de0be304c159a9bd898c7d84b0899eacb00723d98b5 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 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd1041a433bfbdb46d4dd87a5afb60c18c8629a3d988323f9e7a1d709775b5a7e5930276a7121c0725a22705c0976e36 SHA512 32854388d7e720ad67156baf50bf2bae7bd878ca3e35fd7e44e57cad3f434f69d56bbbedd61509f8a1faf01c9eae74a078df8fe130780b182c05c05cb1c39ebe -EBUILD libxml2-2.9.13-r1.ebuild 6865 BLAKE2B bcddef93bc37db888a57086bf828f9693565a55894faf05fb833bf3343b08c7bd304dfdd7ecca36fdd321ab9873a07ae2c15db9af2b1e2b2ab6743a320d0d9b9 SHA512 77d0cf94670d31561b13d15370a4f03c107506e53148a4321bab28269d939c604e3d99f738c5f192c8a0d82a571de8dca1bc40828a63f6e09c5e9952dd2893f2 -EBUILD libxml2-2.9.14-r1.ebuild 5034 BLAKE2B 52b3409a6d97bcad84784201c0a834ee612eea977f28b6daf1d4443dc3b041633bc03648d8314be0b43918b7175a2d387e5b19c942379b5e483867b7b5e15614 SHA512 433ce2647c79befbf23bd8fe7f67c8abb26500953024a270f5f49a7439cc20406f413492ed3bc94956f178516700d0bd1b06a396b6dcf1dada3036fc0e47baca -EBUILD libxml2-9999.ebuild 5136 BLAKE2B f936cd1ab8042fe354daf003e2e20e8d30f24e42e2853a846afe8522e3d6321dd910416c9e1f1fd0815aa100ec718210cdb6f42df02fde385e3ed947a28769e8 SHA512 21210ed2ff26f54a503c0fa822f695026f118e8039812cabb60ed75ee04f0b0c463487189720de4809d0de09e3207d9c59f758b9db18ed86f86d03e5dbeb3a0a +EBUILD libxml2-2.9.14-r1.ebuild 5029 BLAKE2B 74875e62eede1a5dcacecbd383cc33cf95ef21f49998b88ee88166ddf659f1241840a44412118a3a2a59af6d1438c74e10beadf709ee8da8b826ca1d60e553f1 SHA512 61eac30dfcafe2daf7aa36c85d2c6803e9f44514138d087954ccd626a390056e8018c578880506f171bd4d6865ae22bcf492d5f01acd87ab77d992636cbd9827 +EBUILD libxml2-9999.ebuild 5076 BLAKE2B bd642aea861bd1b6245953514ad245fb47917d5b21a68c52d2962d28fcd4e58e9552e12a0f1f7abb039d51f80bd8d8969b08a8b2015acd136ab6d1a609b62ae9 SHA512 de9253d2f149d3e80e3af1be1a0ca412b49a3146bc63746c7dc1680c0bc3829c8999657126d976bc64f59202cf6f146d7356999e832d05bf759f61a277808383 MISC metadata.xml 458 BLAKE2B 318644d7202e85490c0b2f7a6fd36744cce5e4fa8929534149823d679a7fd01d118b9653ea5039c9e82b7cdcd423bf4541313cf550027ccfab8393f0b9b8ceca SHA512 b173246c3ec8351343bbe16f5572728ce6c6740056a0cf96e9eb4d975c181d54213d06c41ada9c38ac11727359d14d453cd1e824b29a52f7291a7ee50bfa5ed0 diff --git a/dev-libs/libxml2/files/libxml2-2.9.13-testapi-missing-xml.patch b/dev-libs/libxml2/files/libxml2-2.9.13-testapi-missing-xml.patch deleted file mode 100644 index fa8e3d392d18..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.13-testapi-missing-xml.patch +++ /dev/null @@ -1,19 +0,0 @@ -From b31e07dbf40c3998dd466829e818f5870296272d Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Fri, 22 Apr 2022 20:14:05 -0400 -Subject: [PATCH] testapi: remove leading slash from "/missing.xml" - -Fixes an error when running tests in a sandbox on Gentoo Linux. - -Bug: https://bugs.gentoo.org/839804 ---- a/testapi.c -+++ b/testapi.c -@@ -442,7 +442,7 @@ static void des_eaten_name(int no ATTRIBUTE_UNUSED, xmlChar *val ATTRIBUTE_UNUSE - #define gen_nb_fileoutput 6 - - static const char *gen_fileoutput(int no, int nr ATTRIBUTE_UNUSED) { -- if (no == 0) return("/missing.xml"); -+ if (no == 0) return("missing.xml"); - if (no == 1) return(""); - if (no == 2) return(REMOTE2GOOD); - if (no == 3) return(REMOTE1GOOD); 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 deleted file mode 100644 index 468214d0bd8b..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.9.8-out-of-tree-test.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://gitlab.gnome.org/GNOME/libxml2/merge_requests/14 - -From 54878c018af979b20ca1bfbf12599973484cae5b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Thu, 3 Jan 2019 05:44:03 -0500 -Subject: [PATCH] fix reader5.py test when building out of tree - -When building out of tree, the relative path this test uses doesn't -work. Resolve the path relative to the test script itself instead. - -Url: https://bugs.gentoo.org/565576 ---- a/python/tests/reader5.py -+++ b/python/tests/reader5.py -@@ -4,6 +4,7 @@ - # this extract the Dragon bibliography entries from the XML specification - # - import libxml2 -+import os - import sys - - # Memory debug specific -@@ -14,7 +15,8 @@ Ravi Sethi, and Jeffrey D. Ullman. - Compilers: Principles, Techniques, and Tools. - Reading: Addison-Wesley, 1986, rpt. corr. 1988.""" - --f = open('../../test/valid/REC-xml-19980210.xml', 'rb') -+basedir = os.path.dirname(os.path.realpath(__file__)) -+f = open(os.path.join(basedir, '../../test/valid/REC-xml-19980210.xml'), 'rb') - input = libxml2.inputBuffer(f) - reader = input.newTextReader("REC") - res="" diff --git a/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild deleted file mode 100644 index 5102622cfb0d..000000000000 --- a/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# Note: Please bump in sync with dev-libs/libxslt - -PATCHSET_VERSION="2.9.12-r5-patchset" - -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" -inherit autotools flag-o-matic prefix python-r1 multilib-minimal - -XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" -XSTS_NAME_1="xmlschema2002-01-16" -XSTS_NAME_2="xmlschema2004-01-14" -XSTS_TARBALL_1="xsts-2002-01-16.tar.gz" -XSTS_TARBALL_2="xsts-2004-01-14.tar.gz" -XMLCONF_TARBALL="xmlts20130923.tar.gz" -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 git-r3 -else - inherit gnome.org - 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 -SRC_URI+=" - https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${PATCHSET_VERSION}.tar.bz2 - test? ( - ${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1} - ${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} - https://www.w3.org/XML/Test/${XMLCONF_TARBALL} - )" -S="${WORKDIR}/${PN}-${PV%_rc*}" - -LICENSE="MIT" -SLOT="2" -IUSE="debug examples icu lzma +python readline static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND=" - dev-util/gtk-doc-am - virtual/pkgconfig -" -RDEPEND=" - >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xml2-config -) - -DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO ) - -PATCHES=( - ## Gentoo - # Patches needed for prefix support - "${WORKDIR}"/${PN}-2.7.1-catalog_path.patch - - # Fix python detection, bug #567066 - # https://bugzilla.gnome.org/show_bug.cgi?id=760458 - "${WORKDIR}"/${PN}-2.9.2-python-ABIFLAG.patch - - # Fix python tests when building out of tree #565576 - "${WORKDIR}"/${PN}-2.9.8-out-of-tree-test.patch - - # bug #745162 - "${WORKDIR}"/${PN}-2.9.8-python3-unicode-errors.patch - - # Don't bother copying Python's libraries (bug #798942) - "${WORKDIR}"/${PN}-2.9.12-dont-copy-python-ldflags.patch - - # https://bugs.gentoo.org/839804 - "${FILESDIR}"/libxml2-2.9.13-testapi-missing-xml.patch -) - -src_unpack() { - if [[ ${PV} == 9999 ]] ; then - git-r3_src_unpack - else - local tarname=${P/_rc/-rc}.tar.xz - - # ${A} isn't used to avoid unpacking of test tarballs into ${WORKDIR}, - # as they are needed as tarballs in ${S}/xstc instead and not unpacked - unpack ${tarname} ${PN}-${PATCHSET_VERSION}.tar.bz2 - fi - - cd "${S}" || die - - if use test ; then - cp "${DISTDIR}/${XSTS_TARBALL_1}" \ - "${DISTDIR}/${XSTS_TARBALL_2}" \ - "${S}"/xstc/ \ - || die "Failed to install test tarballs" - unpack ${XMLCONF_TARBALL} - fi -} - -src_prepare() { - default - - eprefixify catalog.c xmlcatalog.c runtest.c xmllint.c - - if [[ ${CHOST} == *-darwin* ]] ; then - # Avoid final linking arguments for python modules - sed -i -e '/PYTHON_LIBS/s/ldflags/libs/' configure.ac || die - # gcc-apple doesn't grok -Wno-array-bounds - sed -i -e 's/-Wno-array-bounds//' configure.ac || die - fi - - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - # We now need to run eautoreconf at the end to prevent maintainer mode. - #elibtoolize - # Needed for https://gitlab.gnome.org/GNOME/libxml2/-/issues/338 too in 2.9.13 - eautoreconf -} - -multilib_src_configure() { - # Filter seemingly problematic CFLAGS (#26320) - filter-flags -fprefetch-loop-arrays -funroll-loops - - # Notes: - # 1) USE zlib support breaks gnome2 - # (libgnomeprint for instance fails to compile with - # fresh install, and existing) - (22 Dec 2002). - # - # 2) The meaning of the 'debug' USE flag does not apply to the --with-debug - # switch (enabling the libxml2 debug module). See bug #100898. - # - # 3) --with-mem-debug causes unusual segmentation faults (bug #105120). - - libxml2_configure() { - ECONF_SOURCE="${S}" econf \ - --enable-ipv6 \ - --with-html-subdir=${PF}/html \ - $(use_with debug run-debug) \ - $(use_with icu) \ - $(use_with lzma) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with readline) \ - $(multilib_native_use_with readline history) \ - "$@" - } - - libxml2_py_configure() { - # Ensure python build dirs exist - mkdir -p "${BUILD_DIR}" || die - - # Odd build system, also see bug #582130 - run_in_build_dir libxml2_configure \ - "--with-python=${EPYTHON}" \ - "--with-python-install-dir=$(python_get_sitedir)" - } - - # Build python bindings separately - libxml2_configure --without-python - - if multilib_is_native_abi && use python ; then - python_foreach_impl libxml2_py_configure - fi -} - -libxml2_py_emake() { - pushd "${BUILD_DIR}/python" > /dev/null || die - - emake "$@" - - popd > /dev/null || die -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use python ; then - local native_builddir="${BUILD_DIR}" - - python_foreach_impl libxml2_py_emake \ - top_builddir="${native_builddir}" \ - all - fi -} - -multilib_src_test() { - ln -s "${S}"/xmlconf || die - - emake check - - if multilib_is_native_abi && use python ; then - python_foreach_impl libxml2_py_emake test - fi -} - -multilib_src_install() { - emake \ - DESTDIR="${D}" \ - EXAMPLES_DIR="${EPREFIX}"/usr/share/doc/${PF}/examples \ - install - - if multilib_is_native_abi && use python ; then - python_foreach_impl libxml2_py_emake \ - DESTDIR="${D}" \ - docsdir="${EPREFIX}"/usr/share/doc/${PF}/python \ - exampledir="${EPREFIX}"/usr/share/doc/${PF}/python/examples \ - install - - python_foreach_impl python_optimize - fi -} - -multilib_src_install_all() { - rm -rf "${ED}"/usr/share/doc/${P} - - einstalldocs - - if ! use examples ; then - rm -rf "${ED}"/usr/share/doc/${PF}/examples - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_postinst() { - # We don't want to do the xmlcatalog during stage1, as xmlcatalog will not - # be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887. - if [[ -n "${ROOT}" ]]; then - elog "Skipping XML catalog creation for stage building (bug #208887)." - else - # Need an XML catalog, so no-one writes to a non-existent one - CATALOG="${EROOT}/etc/xml/catalog" - - # We don't want to clobber an existing catalog though, - # only ensure that one is there - # - if [[ ! -e "${CATALOG}" ]]; then - [[ -d "${EROOT}/etc/xml" ]] || mkdir -p "${EROOT}/etc/xml" - "${EPREFIX}"/usr/bin/xmlcatalog --create > "${CATALOG}" - einfo "Created XML catalog in ${CATALOG}" - fi - fi -} diff --git a/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild index 5a2c61cefdfd..28e55087cabf 100644 --- a/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.14-r1.ebuild @@ -5,8 +5,8 @@ EAPI=7 # Note: Please bump in sync with dev-libs/libxslt -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" +PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_REQ_USE="xml(+)" inherit autotools flag-o-matic python-r1 multilib-minimal XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" @@ -25,7 +25,7 @@ if [[ ${PV} == 9999 ]] ; then inherit autotools git-r3 else 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" + 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 SRC_URI+=" diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild index 847a7c331d40..d651157658dc 100644 --- a/dev-libs/libxml2/libxml2-9999.ebuild +++ b/dev-libs/libxml2/libxml2-9999.ebuild @@ -5,8 +5,8 @@ EAPI=8 # Note: Please bump in sync with dev-libs/libxslt -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="xml" +PYTHON_COMPAT=( python3_{8..11} ) +PYTHON_REQ_USE="xml(+)" inherit flag-o-matic python-r1 multilib-minimal XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite" @@ -58,10 +58,6 @@ MULTILIB_CHOST_TOOLS=( DOCS=( NEWS README.md TODO TODO_SCHEMAS python/TODO ) -PATCHES=( - "${FILESDIR}"/${PN}-2.9.8-out-of-tree-test.patch -) - src_unpack() { if [[ ${PV} == 9999 ]] ; then git-r3_src_unpack -- cgit v1.2.3