commit:     72624c0b32f705f9defb684f98645d63cb39d5a0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 18 01:58:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 18 03:09:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72624c0b

dev-libs/libxslt: add 1.1.36

Bug: https://bugs.gentoo.org/582130
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libxslt/Manifest                                 |  1 +
 .../{libxslt-9999.ebuild => libxslt-1.1.36.ebuild}        | 15 ++++++++++-----
 dev-libs/libxslt/libxslt-9999.ebuild                      |  8 ++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index e925f79f8190..39f5cab84cc4 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1 +1,2 @@
 DIST libxslt-1.1.35.tar.xz 1827548 BLAKE2B 
9667a93e61f50098a512c1351bce2ee937fc5d29488d010b525122d28ffedc73e0930402f3df2d378161a031dc016a15f0f03bdc343f0c4aa5d0b5c454f8002d
 SHA512 
9dd4a699235f50ae9b75b25137e387471635b4b2da0a4e4380879cd49f1513470fcfbfd775269b066eac513a1ffa6860c77ec42747168e2348248f09f60c8c96
+DIST libxslt-1.1.36.tar.xz 1591356 BLAKE2B 
7cdb38b52295477dcf4c9fdecfb64bc8e770b37787b3f4522d6156838725f4ee506b6d58ec18d17adeb22c78aa62d0685e77ad23e72901d1083de4efef1ae0df
 SHA512 
8a524d32fca18e8b108c1b300d1381c01a71a87dc72a09bc13613772c2836b1350d8caa0625782c6cadf953f7a15ce805718a754cef894ee77b20442fc10f5c8

diff --git a/dev-libs/libxslt/libxslt-9999.ebuild 
b/dev-libs/libxslt/libxslt-1.1.36.ebuild
similarity index 83%
copy from dev-libs/libxslt/libxslt-9999.ebuild
copy to dev-libs/libxslt/libxslt-1.1.36.ebuild
index bd5015b66924..6f198ac22606 100644
--- a/dev-libs/libxslt/libxslt-9999.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.36.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Note: Please bump this in sync with dev-libs/libxml2.
 
 PYTHON_COMPAT=( python3_{8..11} )
-inherit libtool python-r1 multilib-minimal
+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 autotools git-r3
+       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"
+       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"
@@ -48,7 +48,12 @@ src_prepare() {
                eautoreconf
        else
                # Prefix always needs elibtoolize if not eautoreconf'd.
-               elibtoolize
+               #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
 }
 

diff --git a/dev-libs/libxslt/libxslt-9999.ebuild 
b/dev-libs/libxslt/libxslt-9999.ebuild
index bd5015b66924..f76f9910fa95 100644
--- a/dev-libs/libxslt/libxslt-9999.ebuild
+++ b/dev-libs/libxslt/libxslt-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Note: Please bump this in sync with dev-libs/libxml2.
 
 PYTHON_COMPAT=( python3_{8..11} )
-inherit libtool python-r1 multilib-minimal
+inherit python-r1 multilib-minimal
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt";
@@ -14,8 +14,8 @@ if [[ ${PV} == 9999 ]] ; then
        EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt";
        inherit autotools 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"
+       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"

Reply via email to