From 8993ea73a9714d22178ba6ada8c04be83cd71ec7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Aug 2022 22:47:16 +0100 Subject: gentoo auto-resync : 29:08:2022 - 22:47:16 --- dev-libs/libxslt/Manifest | 6 +- dev-libs/libxslt/libxslt-1.1.36.ebuild | 124 --------------------------------- dev-libs/libxslt/libxslt-1.1.37.ebuild | 123 ++++++++++++++++++++++++++++++++ dev-libs/libxslt/libxslt-9999.ebuild | 4 ++ 4 files changed, 130 insertions(+), 127 deletions(-) delete mode 100644 dev-libs/libxslt/libxslt-1.1.36.ebuild create mode 100644 dev-libs/libxslt/libxslt-1.1.37.ebuild (limited to 'dev-libs/libxslt') diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest index a95dc8f577e5..31cfb09317dd 100644 --- a/dev-libs/libxslt/Manifest +++ b/dev-libs/libxslt/Manifest @@ -1,6 +1,6 @@ DIST libxslt-1.1.35.tar.xz 1827548 BLAKE2B 9667a93e61f50098a512c1351bce2ee937fc5d29488d010b525122d28ffedc73e0930402f3df2d378161a031dc016a15f0f03bdc343f0c4aa5d0b5c454f8002d SHA512 9dd4a699235f50ae9b75b25137e387471635b4b2da0a4e4380879cd49f1513470fcfbfd775269b066eac513a1ffa6860c77ec42747168e2348248f09f60c8c96 -DIST libxslt-1.1.36.tar.xz 1591356 BLAKE2B 7cdb38b52295477dcf4c9fdecfb64bc8e770b37787b3f4522d6156838725f4ee506b6d58ec18d17adeb22c78aa62d0685e77ad23e72901d1083de4efef1ae0df SHA512 8a524d32fca18e8b108c1b300d1381c01a71a87dc72a09bc13613772c2836b1350d8caa0625782c6cadf953f7a15ce805718a754cef894ee77b20442fc10f5c8 +DIST libxslt-1.1.37.tar.xz 1588572 BLAKE2B 096d93dd7178bf4483207514b1435f5bf426eea4952ffab7cc00c3e85aa736534c4acb5377af9647aa77a0cd793205194509d997a7bb5cae692f65e326566cd8 SHA512 a4e477d2bb918b7d01945e2c7491c3a4aae799dc1602bbd13de55c8a5052e210a20bc45115347eae44473c8b1d03dbc5e4a2aa18c2218f1fdfd376d87cd501ca EBUILD libxslt-1.1.35.ebuild 1913 BLAKE2B 6c68990defa39e6d04fc70b4a2f4f3d1e1e27a109f04fefa85c0973aa8f9bd4680311fb25c8878cd65b29afc51bb7f4c7cc8a294b17f8a0f7a1cb77307ccc184 SHA512 9975052b66a9d23e5e0ce4c5df5647a4a43ebf9509dfae2cb90968fead499b2e7f83e0e74eb7ef51b969c0c0b7c89d97a1d1e62aa32b2b1eab6c724806498d01 -EBUILD libxslt-1.1.36.ebuild 2936 BLAKE2B d725f63af0542cbef7e1d1806a3b46040b7ebfa884f61337df0b1b26a3e0fddbd965fb96788a2317cd2775fdcf4c7eb1cefd61da1ed4ee40b35acbb030ca0e33 SHA512 6d97110b767322df85985dd037fb495d44b235a514bf6ff780eb4bf9642bc74b24cfa613f8b654b1fd093ccde9ca02b524638a5aac9d11ff6a51cc0d8b68a5b1 -EBUILD libxslt-9999.ebuild 2774 BLAKE2B 9ad743eeb27ad818fb0ccbc2198b88855d4f35348386b99606ca2b7e4f66501b1a15072a1a9c759777ff0d9e00b8d24a4dc081851bd9202767c0357894aa6518 SHA512 2f9055e43050325543460580137da2d85cd8b188c80f2aa5bd5096a5900f13c6fbdf0c6029cc99527dc9e7a81bc5abbce1e33a5ffb447f290e838402c436fb0c +EBUILD libxslt-1.1.37.ebuild 2977 BLAKE2B 137a6782d1b9349c024444b9bdb8ab5e5d0e83347873766dbe783045b3c1e28992947f4506fbb46b02b72512a9fe4e9cd07d0dae0ad284ea256194dcda76d954 SHA512 f4764e3307ca818419faa3457c4bb7a274eaf3fce27ba780638016f7d3b60a453d61a59a778813493954adef6d0cbff5c68d503abcc0d9cb4ed9549d9f0ffe64 +EBUILD libxslt-9999.ebuild 2977 BLAKE2B 137a6782d1b9349c024444b9bdb8ab5e5d0e83347873766dbe783045b3c1e28992947f4506fbb46b02b72512a9fe4e9cd07d0dae0ad284ea256194dcda76d954 SHA512 f4764e3307ca818419faa3457c4bb7a274eaf3fce27ba780638016f7d3b60a453d61a59a778813493954adef6d0cbff5c68d503abcc0d9cb4ed9549d9f0ffe64 MISC metadata.xml 458 BLAKE2B 75fd3316bf24367ed9748bf7fefd6ebc36811d1cef9606b9fd68155ef7412d192ebc3cc883a79f15210decb7ef7707ff82155ec2f04974c2dca84496660519a8 SHA512 9baf1253900f23539a78ef57cc03cca552eadeb92721517e2f3f54c3df72be8d364b30449ad433793c38a2c1872273231f0b3fe865b2ace2e605a1ae290c4f6b diff --git a/dev-libs/libxslt/libxslt-1.1.36.ebuild b/dev-libs/libxslt/libxslt-1.1.36.ebuild deleted file mode 100644 index 6f198ac22606..000000000000 --- a/dev-libs/libxslt/libxslt-1.1.36.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Note: Please bump this in sync with dev-libs/libxml2. - -PYTHON_COMPAT=( python3_{8..11} ) -inherit autotools python-r1 multilib-minimal - -DESCRIPTION="XSLT libraries and tools" -HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt" -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt" - 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 - -LICENSE="MIT" -SLOT="0" -IUSE="crypt debug examples python static-libs" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -BDEPEND=">=virtual/pkgconfig-1" -RDEPEND=" - >=dev-libs/libxml2-2.9.11:2[${MULTILIB_USEDEP}] - crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) - python? ( ${PYTHON_DEPS} ) -" -DEPEND="${RDEPEND}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/xslt-config -) - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/libxslt/xsltconfig.h -) - -DOCS=( AUTHORS FEATURES NEWS README TODO ) - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - eautoreconf - else - # Prefix always needs elibtoolize if not eautoreconf'd. - #elibtoolize - - # Temporarily for Python 3.10 fix (version used for - # dist tarballs fails w/ "3.1" error) - # See https://gitlab.gnome.org/GNOME/libxslt/-/issues/72. - eautoreconf - fi -} - -multilib_src_configure() { - libxslt_configure() { - ECONF_SOURCE="${S}" econf \ - --without-python \ - $(use_with crypt crypto) \ - $(use_with debug) \ - $(use_with debug mem-debug) \ - $(use_enable static-libs static) \ - "$@" - } - - # Build Python bindings separately - libxslt_configure --without-python - - if multilib_is_native_abi && use python ; then - NATIVE_BUILD_DIR="${BUILD_DIR}" - python_foreach_impl run_in_build_dir libxslt_configure --with-python - fi -} - -libxslt_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 - python_foreach_impl run_in_build_dir libxslt_py_emake all - fi -} - -multilib_src_test() { - default - - if multilib_is_native_abi && use python ; then - python_foreach_impl run_in_build_dir libxslt_py_emake test - fi -} - -multilib_src_install() { - # "default" does not work here - docs are installed by multilib_src_install_all - emake DESTDIR="${D}" install - - if multilib_is_native_abi && use python; then - python_foreach_impl run_in_build_dir libxslt_py_emake \ - DESTDIR="${D}" \ - install - fi -} - -multilib_src_install_all() { - einstalldocs - - if ! use examples ; then - rm -rf "${ED}"/usr/share/doc/${PF}/tutorial{,2} || die - rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die - fi - - find "${ED}" -type f -name "*.la" -delete || die -} diff --git a/dev-libs/libxslt/libxslt-1.1.37.ebuild b/dev-libs/libxslt/libxslt-1.1.37.ebuild new file mode 100644 index 000000000000..a4fddfe4f2e6 --- /dev/null +++ b/dev-libs/libxslt/libxslt-1.1.37.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Note: Please bump this in sync with dev-libs/libxml2. + +PYTHON_COMPAT=( python3_{8..11} ) +inherit python-r1 multilib-minimal + +DESCRIPTION="XSLT libraries and tools" +HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt" +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt" + inherit autotools git-r3 +else + inherit libtool 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 + +LICENSE="MIT" +SLOT="0" +IUSE="crypt debug examples python static-libs" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +BDEPEND=">=virtual/pkgconfig-1" +RDEPEND=" + >=dev-libs/libxml2-2.9.11:2[${MULTILIB_USEDEP}] + crypt? ( >=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/xslt-config +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libxslt/xsltconfig.h +) + +DOCS=( AUTHORS FEATURES NEWS README TODO ) + +src_prepare() { + default + + if [[ ${PV} == 9999 ]] ; then + eautoreconf + else + # Prefix always needs elibtoolize if not eautoreconf'd. + elibtoolize + fi +} + +multilib_src_configure() { + libxslt_configure() { + ECONF_SOURCE="${S}" econf \ + --without-python \ + $(use_with crypt crypto) \ + $(use_with debug) \ + $(use_with debug mem-debug) \ + $(use_enable static-libs static) \ + "$@" + } + + # Build Python bindings separately + libxslt_configure --without-python + + if multilib_is_native_abi && use python ; then + NATIVE_BUILD_DIR="${BUILD_DIR}" + python_foreach_impl run_in_build_dir libxslt_configure --with-python + fi +} + +libxslt_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 + python_foreach_impl run_in_build_dir libxslt_py_emake all + fi +} + +multilib_src_test() { + default + + if multilib_is_native_abi && use python ; then + python_foreach_impl run_in_build_dir libxslt_py_emake test + fi +} + +multilib_src_install() { + # "default" does not work here - docs are installed by multilib_src_install_all + emake DESTDIR="${D}" install + + if multilib_is_native_abi && use python; then + python_foreach_impl run_in_build_dir libxslt_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 + python_foreach_impl python_optimize + fi +} + +multilib_src_install_all() { + einstalldocs + + if ! use examples ; then + rm -rf "${ED}"/usr/share/doc/${PF}/tutorial{,2} || die + rm -rf "${ED}"/usr/share/doc/${PF}/python/examples || die + fi + + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/dev-libs/libxslt/libxslt-9999.ebuild b/dev-libs/libxslt/libxslt-9999.ebuild index f76f9910fa95..a4fddfe4f2e6 100644 --- a/dev-libs/libxslt/libxslt-9999.ebuild +++ b/dev-libs/libxslt/libxslt-9999.ebuild @@ -104,6 +104,10 @@ multilib_src_install() { python_foreach_impl run_in_build_dir libxslt_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 + python_foreach_impl python_optimize fi } -- cgit v1.2.3