Diff xz-utils-5.2.12 with a xz-utils-5.4.2

/usr/portage/app-arch/xz-utils/xz-utils-5.4.2.ebuild 2023-10-09 14:52:28.196368317 +0300
4 4
# Remember: we cannot leverage autotools in this ebuild in order
5 5
#           to avoid circular deps with autotools
6 6

  
7
EAPI=8
7
EAPI=7
8 8

  
9 9
inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
10 10

  
11 11
if [[ ${PV} == 9999 ]] ; then
12
	EGIT_REPO_URI="https://git.tukaani.org/xz.git"
12
	# Per tukaani.org, git.tukaani.org is a mirror of github and
13
	# may be behind.
14
	EGIT_REPO_URI="
15
		https://github.com/tukaani-project/xz
16
		https://git.tukaani.org/xz.git
17
	"
13 18
	inherit git-r3 autotools
14 19

  
15 20
	# bug #272880 and bug #286068
16 21
	BDEPEND="sys-devel/gettext >=sys-devel/libtool-2"
17 22
else
18
	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/jiatan.asc
23
	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/lassecollin.asc
19 24
	inherit verify-sig
20 25

  
21 26
	MY_P="${PN/-utils}-${PV/_}"
22 27
	SRC_URI="
28
		https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz
23 29
		mirror://sourceforge/lzmautils/${MY_P}.tar.gz
24 30
		https://tukaani.org/xz/${MY_P}.tar.gz
25 31
		verify-sig? (
32
			https://github.com/tukaani-project/xz/releases/download/v${PV}/${MY_P}.tar.gz.sig
26 33
			https://tukaani.org/xz/${MY_P}.tar.gz.sig
27 34
		)
28 35
	"
29 36

  
30 37
	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
31
		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
38
		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
32 39
	fi
33 40

  
34 41
	S="${WORKDIR}/${MY_P}"
......
40 47
# See top-level COPYING file as it outlines the various pieces and their licenses.
41 48
LICENSE="public-domain LGPL-2.1+ GPL-2+"
42 49
SLOT="0"
43
IUSE="+extra-filters nls static-libs"
50
IUSE="doc +extra-filters nls static-libs"
44 51

  
45 52
if [[ ${PV} != 9999 ]] ; then
46
	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-jiatan )"
53
	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20230213 )"
47 54
fi
48 55

  
49
# Tests currently do not account for smaller feature set
50
RESTRICT="!extra-filters? ( test )"
56
PATCHES=(
57
	"${FILESDIR}"/${P}-Wsign-conversion.patch
58
)
51 59

  
52 60
src_prepare() {
53 61
	default
......
64 72
multilib_src_configure() {
65 73
	local myconf=(
66 74
		--enable-threads
75
		$(multilib_native_use_enable doc)
67 76
		$(use_enable nls)
68 77
		$(use_enable static-libs static)
69 78
	)
......
106 115

  
107 116
multilib_src_install_all() {
108 117
	find "${ED}" -type f -name '*.la' -delete || die
109
	rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
118

  
119
	if use doc ; then
120
		rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
121
	fi
110 122
}
111 123

  
112 124
pkg_preinst() {
Thank you!