Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libxslt/
Date: Thu, 18 Aug 2022 03:10:25
Message-Id: 1660792195.72624c0b32f705f9defb684f98645d63cb39d5a0.sam@gentoo
1 commit: 72624c0b32f705f9defb684f98645d63cb39d5a0
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 18 01:58:08 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 18 03:09:55 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72624c0b
7
8 dev-libs/libxslt: add 1.1.36
9
10 Bug: https://bugs.gentoo.org/582130
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 dev-libs/libxslt/Manifest | 1 +
14 .../{libxslt-9999.ebuild => libxslt-1.1.36.ebuild} | 15 ++++++++++-----
15 dev-libs/libxslt/libxslt-9999.ebuild | 8 ++++----
16 3 files changed, 15 insertions(+), 9 deletions(-)
17
18 diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
19 index e925f79f8190..39f5cab84cc4 100644
20 --- a/dev-libs/libxslt/Manifest
21 +++ b/dev-libs/libxslt/Manifest
22 @@ -1 +1,2 @@
23 DIST libxslt-1.1.35.tar.xz 1827548 BLAKE2B 9667a93e61f50098a512c1351bce2ee937fc5d29488d010b525122d28ffedc73e0930402f3df2d378161a031dc016a15f0f03bdc343f0c4aa5d0b5c454f8002d SHA512 9dd4a699235f50ae9b75b25137e387471635b4b2da0a4e4380879cd49f1513470fcfbfd775269b066eac513a1ffa6860c77ec42747168e2348248f09f60c8c96
24 +DIST libxslt-1.1.36.tar.xz 1591356 BLAKE2B 7cdb38b52295477dcf4c9fdecfb64bc8e770b37787b3f4522d6156838725f4ee506b6d58ec18d17adeb22c78aa62d0685e77ad23e72901d1083de4efef1ae0df SHA512 8a524d32fca18e8b108c1b300d1381c01a71a87dc72a09bc13613772c2836b1350d8caa0625782c6cadf953f7a15ce805718a754cef894ee77b20442fc10f5c8
25
26 diff --git a/dev-libs/libxslt/libxslt-9999.ebuild b/dev-libs/libxslt/libxslt-1.1.36.ebuild
27 similarity index 83%
28 copy from dev-libs/libxslt/libxslt-9999.ebuild
29 copy to dev-libs/libxslt/libxslt-1.1.36.ebuild
30 index bd5015b66924..6f198ac22606 100644
31 --- a/dev-libs/libxslt/libxslt-9999.ebuild
32 +++ b/dev-libs/libxslt/libxslt-1.1.36.ebuild
33 @@ -1,21 +1,21 @@
34 # Copyright 1999-2022 Gentoo Authors
35 # Distributed under the terms of the GNU General Public License v2
36
37 -EAPI=7
38 +EAPI=8
39
40 # Note: Please bump this in sync with dev-libs/libxml2.
41
42 PYTHON_COMPAT=( python3_{8..11} )
43 -inherit libtool python-r1 multilib-minimal
44 +inherit autotools python-r1 multilib-minimal
45
46 DESCRIPTION="XSLT libraries and tools"
47 HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt"
48 if [[ ${PV} == 9999 ]] ; then
49 EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt"
50 - inherit autotools git-r3
51 + inherit git-r3
52 else
53 inherit gnome.org
54 - 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"
55 + 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"
56 fi
57
58 LICENSE="MIT"
59 @@ -48,7 +48,12 @@ src_prepare() {
60 eautoreconf
61 else
62 # Prefix always needs elibtoolize if not eautoreconf'd.
63 - elibtoolize
64 + #elibtoolize
65 +
66 + # Temporarily for Python 3.10 fix (version used for
67 + # dist tarballs fails w/ "3.1" error)
68 + # See https://gitlab.gnome.org/GNOME/libxslt/-/issues/72.
69 + eautoreconf
70 fi
71 }
72
73
74 diff --git a/dev-libs/libxslt/libxslt-9999.ebuild b/dev-libs/libxslt/libxslt-9999.ebuild
75 index bd5015b66924..f76f9910fa95 100644
76 --- a/dev-libs/libxslt/libxslt-9999.ebuild
77 +++ b/dev-libs/libxslt/libxslt-9999.ebuild
78 @@ -1,12 +1,12 @@
79 # Copyright 1999-2022 Gentoo Authors
80 # Distributed under the terms of the GNU General Public License v2
81
82 -EAPI=7
83 +EAPI=8
84
85 # Note: Please bump this in sync with dev-libs/libxml2.
86
87 PYTHON_COMPAT=( python3_{8..11} )
88 -inherit libtool python-r1 multilib-minimal
89 +inherit python-r1 multilib-minimal
90
91 DESCRIPTION="XSLT libraries and tools"
92 HOMEPAGE="https://gitlab.gnome.org/GNOME/libxslt"
93 @@ -14,8 +14,8 @@ if [[ ${PV} == 9999 ]] ; then
94 EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/libxslt"
95 inherit autotools git-r3
96 else
97 - inherit gnome.org
98 - 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"
99 + inherit libtool gnome.org
100 + 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"
101 fi
102
103 LICENSE="MIT"