From e68d405c5d712af4387159df07e226217bdda049 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Apr 2022 22:33:41 +0100 Subject: gentoo resync : 06.04.2022 --- dev-libs/libxml2/Manifest | 3 +- dev-libs/libxml2/libxml2-2.9.13-r1.ebuild | 25 ++-- dev-libs/libxml2/libxml2-9999.ebuild | 184 ++++++++++++++++++++++++++++++ 3 files changed, 203 insertions(+), 9 deletions(-) create mode 100644 dev-libs/libxml2/libxml2-9999.ebuild (limited to 'dev-libs/libxml2') diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index c605bd2c6e06..45cfc5964eed 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -6,5 +6,6 @@ DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e3 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.12-r5.ebuild 7424 BLAKE2B 872e88ab344e86efb89f3d5cbe560f20e3a35e8b0a7fdccaf6ebff0fe5111ddf47789f236398666856489dc7272baaa221c8e347c4fbbaec218aaf72bbe2573b SHA512 90ef531d12bd73136f1fdeb8855b1ccead6ee00a3a47fbcf91dc6a03c5c2868a0314497f7433caadaf204ed2acab245d228715276bd6c107ba794397dc0e6a95 -EBUILD libxml2-2.9.13-r1.ebuild 6583 BLAKE2B 9c49b05043e933fff56084538ba5dca1f93d59d38af5a084de4fc02f5543df6f9ad1dc1afb8ae02d6e83889fd431712f69d3ed2223bcf8e645167a286c81d925 SHA512 75f535d26e8607b594baf443dc6e2fd7a7d085f74a5939c92041289efa18d02ab129c31007ef5307569f9abc05fa8b0f8c84907a811b1840703bd331fcf7e96f +EBUILD libxml2-2.9.13-r1.ebuild 6767 BLAKE2B 481f50527b01e1dac47b0f50096e4825cb2350cef99c78381e5c325cbf476418139b4170c2ae92cf1145d7ca7842bd30024160e62f38d811cd2491c5c7672f77 SHA512 438f5f4df22ea7be1fd5577157d673249421a7aefc89e85175c77713275c58b0ec10182d0d8d203ff3deb0d75b425c30cd3ccfa5c6887ddd612981f6d81f5f31 +EBUILD libxml2-9999.ebuild 5009 BLAKE2B fd86fd7c1ec3d216c85c91b7f17479bda72fe5cc63da8bd0600cfe836ace44fce2a9925ffbe714114b10d9c98de5df1faa3d6d45949f092c2c71e2f69d73c5bc SHA512 d83466f9ce9a4dded70b290d2c5791b29eed21a26417836396243d54c18b5101438040a15dbda23416151704e736c12eabec604e9aa06b83697cedbac8fd6960 MISC metadata.xml 458 BLAKE2B 318644d7202e85490c0b2f7a6fd36744cce5e4fa8929534149823d679a7fd01d118b9653ea5039c9e82b7cdcd423bf4541313cf550027ccfab8393f0b9b8ceca SHA512 b173246c3ec8351343bbe16f5572728ce6c6740056a0cf96e9eb4d975c181d54213d06c41ada9c38ac11727359d14d453cd1e824b29a52f7291a7ee50bfa5ed0 diff --git a/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild b/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild index 5d7a300bba44..3378e7fad44d 100644 --- a/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild +++ b/dev-libs/libxml2/libxml2-2.9.13-r1.ebuild @@ -9,7 +9,7 @@ PATCHSET_VERSION="2.9.12-r5-patchset" PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="xml" -inherit autotools flag-o-matic gnome.org prefix python-r1 multilib-minimal +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" @@ -19,19 +19,24 @@ 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 ~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" -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" IUSE="debug examples icu lzma +python readline static-libs test" RESTRICT="!test? ( test )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -75,11 +80,15 @@ PATCHES=( ) src_unpack() { - local tarname=${P/_rc/-rc}.tar.xz + 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 + # ${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 diff --git a/dev-libs/libxml2/libxml2-9999.ebuild b/dev-libs/libxml2/libxml2-9999.ebuild new file mode 100644 index 000000000000..3ad0604b6f1e --- /dev/null +++ b/dev-libs/libxml2/libxml2-9999.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2022 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_{8..10} ) +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" +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 ~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+=" + 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 ) + +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 + + # 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: + # 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 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 test +} + +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 +} + +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 + + 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 + # + 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 +} -- cgit v1.2.3