commit: 7d3f9abe1f009ea1636d7d7827e72261d2d814f1 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Sep 10 06:27:30 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Sep 10 06:29:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d3f9abe
dev-libs/libxml2: drop 2.13.8, 2.14.4, 2.14.4-r1 Bug: https://bugs.gentoo.org/958276 Bug: https://bugs.gentoo.org/960466 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/libxml2/Manifest | 1 - dev-libs/libxml2/files/libxml2-2.14.4-cmake.patch | 66 -------- dev-libs/libxml2/libxml2-2.13.8.ebuild | 190 ---------------------- dev-libs/libxml2/libxml2-2.14.4-r1.ebuild | 184 --------------------- dev-libs/libxml2/libxml2-2.14.4.ebuild | 183 --------------------- 5 files changed, 624 deletions(-) diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest index a25e3a320839..f36d511d44a6 100644 --- a/dev-libs/libxml2/Manifest +++ b/dev-libs/libxml2/Manifest @@ -1,5 +1,4 @@ DIST libxml2-2.13.8.tar.xz 2423128 BLAKE2B 9abe12acb2b619f8649dc4472c39d4c59074a83538bf1a534163737bf9e99e6387fec53404392c325102da1e77f53606f2679c47b7136d7f7541a8fcc6bcd995 SHA512 668e556404693f17e074bc31e2caa5e50bf003ee3cd81b61a51ea25e76efd7eff7ec70ff603eed87b9d9e9b2299673e6e8871798264113e660e703b74b58458f -DIST libxml2-2.14.4.tar.xz 2325848 BLAKE2B 6ee7e4f35e6f15124fe1ceb55758236229f87e05344c55e82c419f8e8dba763adbd25746c038d13189dfadc3bb023fd8891251e78e9c9046d42961829d93b885 SHA512 5991223bdd6c84886bba8fb81c4e48bf92c8bc3571262ffa8c7673a10efeebceafc1dee362624417dca146982d030ee8d0ccda41f4c82d3074845f74ef6da5d4 DIST libxml2-2.14.5.tar.xz 2327528 BLAKE2B cab1d75abfa4dcbceb4b4394664adae9edd1ace7fe33d027e7e6861139a176282ff9e33b46d8b5801032cbe5e75196198d3ddfc2c58fb1dca0942aa06f63decf SHA512 9777fe0eb788a185f13617f74a2e2ffcc2128a6b179d491c06ddbb876d9bb38c951d3d7c2371d184a97143b9b2d8d6eca19fb7fcbbbe4bfa90e728f4bb1cbdf7 DIST xmlts20130923.tar.gz 641522 BLAKE2B 63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be SHA512 d5c4d26b324ed21f4e0641cd7f8b76dbf9de80df8b519982e44d41c960df29fd03618e02e9693b2d11ad06d19c4a965274c95a048ec3b9653eacb919a7f8b733 DIST xsts-2002-01-16.tar.gz 6894439 BLAKE2B 1e9ec63d2c104655e64249e07440a04d862fcbcd4d4e19745d81b34994319b510a531c9d6df1491fae1e90b5d0764f0f1a827251ca8df5d613178b0eab01ef25 SHA512 43300af6d39c1e2221b0ed7318fe14c7464eeb6eb030ed1e22eb29b4ab17f014e2a4c8887c3a46ae5d243e3072da27f00f4e285498ae6f1288177d38d1108288 diff --git a/dev-libs/libxml2/files/libxml2-2.14.4-cmake.patch b/dev-libs/libxml2/files/libxml2-2.14.4-cmake.patch deleted file mode 100644 index b047fba3d5d1..000000000000 --- a/dev-libs/libxml2/files/libxml2-2.14.4-cmake.patch +++ /dev/null @@ -1,66 +0,0 @@ -https://gitlab.gnome.org/GNOME/libxml2/-/commit/5700d989cc18889e1601c651ad69a41af8b32073 -https://gitlab.gnome.org/GNOME/libxml2/-/commit/d3e33dc214276498e73b61188be02b2863c9670a - -From 5700d989cc18889e1601c651ad69a41af8b32073 Mon Sep 17 00:00:00 2001 -From: Markus Rickert <[email protected]> -Date: Wed, 18 Jun 2025 13:48:55 +0200 -Subject: [PATCH] Fix CMake iconv handling after change to private dependency - ---- - CMakeLists.txt | 2 +- - libxml2-config.cmake.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e136f2167..b952d7bfa 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -354,7 +354,7 @@ if(WIN32) - endif() - - if(LIBXML2_WITH_ICONV) -- target_link_libraries(LibXml2 PUBLIC Iconv::Iconv) -+ target_link_libraries(LibXml2 PRIVATE Iconv::Iconv) - if(NOT Iconv_IS_BUILT_IN) - set(ICONV_LIBS "-liconv") - endif() -diff --git a/libxml2-config.cmake.in b/libxml2-config.cmake.in -index e040a759b..3ce7ef43f 100644 ---- a/libxml2-config.cmake.in -+++ b/libxml2-config.cmake.in -@@ -56,7 +56,7 @@ if(NOT LIBXML2_SHARED) - if(LIBXML2_WITH_ICONV) - find_dependency(Iconv) - list(APPEND LIBXML2_LIBRARIES ${Iconv_LIBRARIES}) -- list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "Iconv::Iconv") -+ list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:Iconv::Iconv>") - if(NOT Iconv_FOUND) - set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE) - set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE "Iconv dependency was not found") --- -GitLab - -From d3e33dc214276498e73b61188be02b2863c9670a Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer <[email protected]> -Date: Fri, 20 Jun 2025 11:20:34 +0200 -Subject: [PATCH] cmake: Add missing endif() in libxml2-config.cmake.in - -Regressed with 28ccdaf9. ---- - libxml2-config.cmake.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libxml2-config.cmake.in b/libxml2-config.cmake.in -index 3ce7ef43f..bd971e081 100644 ---- a/libxml2-config.cmake.in -+++ b/libxml2-config.cmake.in -@@ -119,6 +119,7 @@ if(NOT LIBXML2_SHARED) - if(LIBXML2_WITH_HTTP) - list(APPEND LIBXML2_LIBRARIES ws2_32) - list(APPEND LIBXML2_INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:ws2_32>") -+ endif() - endif() - endif() - --- -GitLab diff --git a/dev-libs/libxml2/libxml2-2.13.8.ebuild b/dev-libs/libxml2/libxml2-2.13.8.ebuild deleted file mode 100644 index 3966f952004a..000000000000 --- a/dev-libs/libxml2/libxml2-2.13.8.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2025 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_{11..14} ) -PYTHON_REQ_USE="xml(+)" -inherit autotools python-r1 multilib-minimal - -XSTS_HOME="https://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="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"; -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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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="examples icu lzma +python readline static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - virtual/libiconv - >=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-build/gtk-doc-am" -fi - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xml2-config -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.12.9-icu-pkgconfig.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} - - if [[ -n ${PATCHSET_VERSION} ]] ; then - unpack ${PN}-${PATCHSET_VERSION}.tar.xz - 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 - - # Please do not remove, as else we get references to PORTAGE_TMPDIR - # in /usr/lib/python?.?/site-packages/libxml2mod.la among things. - #elibtoolize - - eautoreconf -} - -multilib_src_configure() { - libxml2_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_with icu) \ - $(use_with lzma) \ - $(use_enable static-libs static) \ - $(multilib_native_use_with readline) \ - $(multilib_native_use_with readline history) \ - --with-legacy \ - "$@" - } - - # 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 - # <[email protected]> - 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.14.4-r1.ebuild b/dev-libs/libxml2/libxml2-2.14.4-r1.ebuild deleted file mode 100644 index 4c63126c61e8..000000000000 --- a/dev-libs/libxml2/libxml2-2.14.4-r1.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2025 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_{11..14} ) -PYTHON_REQ_USE="xml(+)" -inherit python-r1 meson-multilib - -XSTS_HOME="https://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="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"; -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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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" -# see so_version = v_maj + v_min_compat for subslot -SLOT="2/16" -IUSE="icu +python readline static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - virtual/libiconv - >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xml2-config -) - -PATCHES=( - "${FILESDIR}"/libxml2-2.14.2-no-git.patch - "${FILESDIR}"/libxml2-2.14.4-cmake.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} - - if [[ -n ${PATCHSET_VERSION} ]] ; then - unpack ${PN}-${PATCHSET_VERSION}.tar.xz - 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 - - sed -e "/^dir_doc/ s/meson.project_name()$/\'${PF}\'/" -i meson.build || die -} - -python_configure() { - local emesonargs=( - $(meson_feature icu) - $(meson_native_use_feature readline) - $(meson_native_use_feature readline history) - -Dpython=enabled - ) - mkdir "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" >/dev/null || die - meson_src_configure - popd >/dev/null || die -} - -multilib_src_configure() { - local emesonargs=( - -Ddefault_library=$(multilib_native_usex static-libs both shared) - $(meson_feature icu) - $(meson_native_use_feature readline) - $(meson_native_use_feature readline history) - -Dpython=disabled - - # There has been a clean break with a soname bump. - # It's time to deal with the breakage. - # bug #935452 - -Dlegacy=disabled - ) - meson_src_configure - - if multilib_is_native_abi && use python ; then - python_foreach_impl python_configure - fi -} - -python_compile() { - pushd "${BUILD_DIR}" >/dev/null || die - meson_src_compile - popd >/dev/null || die -} - -multilib_src_compile() { - meson_src_compile - - if multilib_is_native_abi && use python ; then - python_foreach_impl python_compile - fi -} - -multilib_src_test() { - meson_src_test - - if multilib_is_native_abi && use python ; then - python_foreach_impl meson_src_test - fi -} - -python_install() { - pushd "${BUILD_DIR}" >/dev/null || die - meson_src_install - python_optimize - popd >/dev/null || die -} - -multilib_src_install() { - if multilib_is_native_abi && use python ; then - python_foreach_impl python_install - fi - - meson_src_install -} - -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 - # <[email protected]> - 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.14.4.ebuild b/dev-libs/libxml2/libxml2-2.14.4.ebuild deleted file mode 100644 index 738064b3f7dc..000000000000 --- a/dev-libs/libxml2/libxml2-2.14.4.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2025 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_{11..14} ) -PYTHON_REQ_USE="xml(+)" -inherit python-r1 meson-multilib - -XSTS_HOME="https://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="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"; -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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-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" -# see so_version = v_maj + v_min_compat for subslot -SLOT="2/16" -IUSE="icu +python readline static-libs test" -RESTRICT="!test? ( test )" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - virtual/libiconv - >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] - icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:= ) -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xml2-config -) - -PATCHES=( - "${FILESDIR}"/libxml2-2.14.2-no-git.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} - - if [[ -n ${PATCHSET_VERSION} ]] ; then - unpack ${PN}-${PATCHSET_VERSION}.tar.xz - 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 - - sed -e "/^dir_doc/ s/meson.project_name()$/\'${PF}\'/" -i meson.build || die -} - -python_configure() { - local emesonargs=( - $(meson_feature icu) - $(meson_native_use_feature readline) - $(meson_native_use_feature readline history) - -Dpython=enabled - ) - mkdir "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" >/dev/null || die - meson_src_configure - popd >/dev/null || die -} - -multilib_src_configure() { - local emesonargs=( - -Ddefault_library=$(multilib_native_usex static-libs both shared) - $(meson_feature icu) - $(meson_native_use_feature readline) - $(meson_native_use_feature readline history) - -Dpython=disabled - - # There has been a clean break with a soname bump. - # It's time to deal with the breakage. - # bug #935452 - -Dlegacy=disabled - ) - meson_src_configure - - if multilib_is_native_abi && use python ; then - python_foreach_impl python_configure - fi -} - -python_compile() { - pushd "${BUILD_DIR}" >/dev/null || die - meson_src_compile - popd >/dev/null || die -} - -multilib_src_compile() { - meson_src_compile - - if multilib_is_native_abi && use python ; then - python_foreach_impl python_compile - fi -} - -multilib_src_test() { - meson_src_test - - if multilib_is_native_abi && use python ; then - python_foreach_impl meson_src_test - fi -} - -python_install() { - pushd "${BUILD_DIR}" >/dev/null || die - meson_src_install - python_optimize - popd >/dev/null || die -} - -multilib_src_install() { - if multilib_is_native_abi && use python ; then - python_foreach_impl python_install - fi - - meson_src_install -} - -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 - # <[email protected]> - 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 -}
