gentoo auto-resync : 11:05:2023 - 23:47:37

3 files changed, 199 insertions, 2 deletions

diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 1be488956b1f..a867cd76b823 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -6,11 +6,13 @@ AUX libxml2-2.11.2-0004-huge-push.patch 913 BLAKE2B 85e4b129ba5a0917a1c038b8d90b
 AUX libxml2-2.11.2-0005-icu-detection.patch 680 BLAKE2B 0c2945a395a9f5430c3726b86aa9cb2b0578ca6307c412d00895261fc44f566eebc4f26ef86187933a352b704cee312bc8bd8c1e6338d6f17e84c6f6b791e040 SHA512 0abc52272b99ad6d6427515ac38d4c59d97e477889702b00dbe3035fd9a4fe7bed6ee9339e9a84836f3f068c2e03793c5c1bc9f36fea5b8493554f42c9d7904c
 DIST libxml2-2.10.4.tar.xz 2643600 BLAKE2B 5bbb63c6e58accf434513aeb974fed7349e5458de642ef89db77768c8d1383532614254e0e3f1d9471e2274c6b81a04a0a3afcb602707ce79550c2bd8e9028d9 SHA512 792c1dceb098cd353a7eca4c46d31cce6310b2553d97fd3918cf0b94d93b2480759202036511bde36c24166236bd4616f57e79959eea9afe3f60614bdfe13094
 DIST libxml2-2.11.2.tar.xz 2627884 BLAKE2B 2785354724af03274f9796b10a5f6918a956a7b08ada2032c644cf7829a67d8628363b74d134dd2677f42d0df7f79a6f105e46e5f073416349f5bb36f6180859 SHA512 9b49522d816d7e5682bb863e7706c8e9ddc629d9148fbe6753e82aef4859c11ba6a4b6e801de967b5c3da517d44d0be2dc6b47553b0efee6f04f4cbf1d7285d5
+DIST libxml2-2.11.3.tar.xz 2628068 BLAKE2B ac1b78d92549da21acd6578cebe2ac44fc874592ce7217c2a4dc45aeebe76eaae7e5276a7a71d744721301f931f03de114201074177129862f79b7fbea0dae31 SHA512 d05b7972a5f1dcec31a2f9a53901242f95f440a9a7be8f0feaa1eeb664f34e66d37883373f4d37dc344ce4d0e9d48534060916921e25b3e2d6b8c1b80828a589
 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.10.4.ebuild 5694 BLAKE2B 1ade1ac63d537f8b10e0f37d7e62d8f72c86bcd01bb2ace42d4c58126c62751fe7e39304354332e84992b3ebe400055cc26ebe3c7e9d02fdf128bb20353a118f SHA512 887700ecb155ac2da033b717f4118054bc0e874902269fd9d22eda771c8df2b0d0b8889a331a01f6527d13a80b0b07a35c2f4fa91666c289102e3f784a0796d3
 EBUILD libxml2-2.11.2-r1.ebuild 5609 BLAKE2B ece4b5c952cc7eff5fa8d7fea0c98df81a35300d3a79a9074ed918b74eb8c2b4615642ddb6efee13b3e02acba2a673911191be5484c1e57c7642308b659fd00e SHA512 46565eb8d8bf3a8d21efab776ce296c61df18ab9d35328d60051e37e03d49fb766a684f0f54a17a60f9babd28a592669cce787899bcf414d37d2f7f6fe91a4ad
 EBUILD libxml2-2.11.2.ebuild 5305 BLAKE2B 04465b5565f9f0a6ca7cfee5631764e9abb6caee3f58ca74ffac6f52088698e4d004b8aee005c2296b3292856e1ffe962fdb85bd261db4552da9e56e219d1b09 SHA512 01ed955947a4e17cf0c2a12bd9513bd7c34c5086e40f3e562b015a995620f550c959a7998f92c1f1569a7a3a76c3c4ab9c45c56549afd44cd8466b2e4efcf866
-EBUILD libxml2-9999.ebuild 5305 BLAKE2B 04465b5565f9f0a6ca7cfee5631764e9abb6caee3f58ca74ffac6f52088698e4d004b8aee005c2296b3292856e1ffe962fdb85bd261db4552da9e56e219d1b09 SHA512 01ed955947a4e17cf0c2a12bd9513bd7c34c5086e40f3e562b015a995620f550c959a7998f92c1f1569a7a3a76c3c4ab9c45c56549afd44cd8466b2e4efcf866
+EBUILD libxml2-2.11.3.ebuild 5306 BLAKE2B 398754f32fac1cf18d98532d0111d4d5d057efaa89897f51e1595d0a40abc3bae2ed8238771ce7eb6524abb7384d1c3ed0675913f4775ce24e82274e08f2126d SHA512 53263f4b11b72a0c6789125aaf6b7f0782dee3ddc181c1c0e646c250184642845d7b4266cbbc17070ab69b3cb515f441831f4bafafcc38efbb8198e5b02e02bc
+EBUILD libxml2-9999.ebuild 5306 BLAKE2B 398754f32fac1cf18d98532d0111d4d5d057efaa89897f51e1595d0a40abc3bae2ed8238771ce7eb6524abb7384d1c3ed0675913f4775ce24e82274e08f2126d SHA512 53263f4b11b72a0c6789125aaf6b7f0782dee3ddc181c1c0e646c250184642845d7b4266cbbc17070ab69b3cb515f441831f4bafafcc38efbb8198e5b02e02bc
 MISC metadata.xml 519 BLAKE2B 528be4ec79b54eaed229c84c96656266acffaa2ab68c7b1e6daecdee77bb1109ea56babceff0459125e04326425be28f436a78f697c363920102b94aca25179d SHA512 85804c662dd019e6c4cad05bb691b2058c9b93c190c57a7b4cc2674bee71a805da41159184c1bae9954700e52b41bb104a2d1e66ea4d1799463626befb691d11
diff --git a/dev-libs/libxml2/libxml2-2.11.3.ebuild b/dev-libs/libxml2/libxml2-2.11.3.ebuild
new file mode 100644
index 000000000000..c04a7cb51a53
--- /dev/null
+++ b/dev-libs/libxml2/libxml2-2.11.3.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Note: Please bump in sync with dev-libs/libxslt
+
+PYTHON_COMPAT=( python3_{10..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"
+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 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 ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+SRC_URI+="
+	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 +ftp icu lzma +python readline static-libs test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+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}"
+BDEPEND="virtual/pkgconfig"
+
+if [[ ${PV} == 9999 ]] ; then
+	BDEPEND+=" dev-util/gtk-doc-am"
+fi
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/xml2-config
+)
+
+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}
+
+		if [[ -n ${PATCHSET_VERSION} ]] ; then
+			unpack ${PN}-${PATCHSET_VERSION}.tar.bz2
+		fi
+	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
+
+	if [[ ${PV} == 9999 ]] ; then
+		eautoreconf
+	else
+		# Please do not remove, as else we get references to PORTAGE_TMPDIR
+		# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
+		elibtoolize
+	fi
+}
+
+multilib_src_configure() {
+	# Filter seemingly problematic CFLAGS (bug #26320)
+	filter-flags -fprefetch-loop-arrays -funroll-loops
+
+	# Notes:
+	# The meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+	libxml2_configure() {
+		ECONF_SOURCE="${S}" econf \
+			--enable-ipv6 \
+			$(use_with ftp) \
+			$(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) \
+			"$@"
+	}
+
+	# Build python bindings separately
+	libxml2_configure --without-python
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_configure --with-python
+}
+
+libxml2_py_emake() {
+	pushd "${BUILD_DIR}"/python >/dev/null || die
+
+	emake top_builddir="${NATIVE_BUILD_DIR}" "$@"
+
+	popd >/dev/null || die
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use python ; then
+		NATIVE_BUILD_DIR="${BUILD_DIR}"
+		python_foreach_impl run_in_build_dir libxml2_py_emake all
+	fi
+}
+
+multilib_src_test() {
+	ln -s "${S}"/xmlconf || die
+
+	emake check
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake check
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	multilib_is_native_abi && use python &&
+		python_foreach_impl run_in_build_dir libxml2_py_emake DESTDIR="${D}" install
+
+	# Hack until automake release is made for the optimise fix
+	# https://git.savannah.gnu.org/cgit/automake.git/commit/?id=bde43d0481ff540418271ac37012a574a4fcf097
+	multilib_is_native_abi && use python && python_foreach_impl python_optimize
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if ! use examples ; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+		rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die
+	fi
+
+	rm -rf "${ED}"/usr/share/doc/${PN}-python-${PVR} || die
+
+	find "${ED}" -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
+		# <obz@gentoo.org>
+		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-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild
index b31269fea30e..c04a7cb51a53 100644
--- a/dev-libs/libxml2/libxml2-9999.ebuild
+++ b/dev-libs/libxml2/libxml2-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 # Note: Please bump in sync with dev-libs/libxslt
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="xml(+)"
 inherit flag-o-matic python-r1 multilib-minimal