Diff tar-1.34-r3 with a tar-1.35

/usr/portage/app-arch/tar/tar-1.35.ebuild 2023-10-09 14:52:28.192368317 +0300
1 1
# Copyright 1999-2023 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=7
4
EAPI=8
5 5

  
6 6
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/tar.asc
7 7
inherit verify-sig
8 8

  
9 9
DESCRIPTION="Use this to make tarballs :)"
10 10
HOMEPAGE="https://www.gnu.org/software/tar/"
11
SRC_URI="mirror://gnu/tar/${P}.tar.xz
12
	https://alpha.gnu.org/gnu/tar/${P}.tar.xz"
13
SRC_URI+=" verify-sig? (
11
SRC_URI="
12
	mirror://gnu/tar/${P}.tar.xz
13
	https://alpha.gnu.org/gnu/tar/${P}.tar.xz
14
	verify-sig? (
14 15
		mirror://gnu/tar/${P}.tar.xz.sig
15 16
		https://alpha.gnu.org/gnu/tar/${P}.tar.xz.sig
16
	)"
17
	)
18
"
17 19

  
18 20
LICENSE="GPL-3+"
19 21
SLOT="0"
20
if [[ -z "$(ver_cut 3)" ]] || [[ "$(ver_cut 3)" -lt 90 ]] ; then
21
	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"
22
if [[ -z "$(ver_cut 3)" || "$(ver_cut 3)" -lt 90 ]] ; then
23
	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"
22 24
fi
23 25
IUSE="acl minimal nls selinux xattr"
24 26

  
......
26 28
	acl? ( virtual/acl )
27 29
	selinux? ( sys-libs/libselinux )
28 30
"
29
DEPEND="${RDEPEND}
31
DEPEND="
32
	${RDEPEND}
30 33
	xattr? ( elibc_glibc? ( sys-apps/attr ) )
31 34
"
32 35
BDEPEND="
......
37 40
	app-alternatives/tar
38 41
"
39 42

  
40
PATCHES=(
41
	"${FILESDIR}"/${P}-fix-cve-2022-48303.patch
42
)
43

  
44 43
src_configure() {
45 44
	# -fanalyzer doesn't make sense for us in ebuilds, as it's for static analysis
46 45
	export gl_cv_warn_c__fanalyzer=no
......
63 62
		--program-prefix=g
64 63
	)
65 64

  
66
	FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
65
	# Drop CONFIG_SHELL hack after 1.35: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=7687bf4acc4dc4554538389383d7fb4c3e6521cd
66
	CONFIG_SHELL="${BROOT}"/bin/bash FORCE_UNSAFE_CONFIGURE=1 econf "${myeconfargs[@]}"
67
}
68

  
69
src_test() {
70
	# Drop after 1.35: https://git.savannah.gnu.org/cgit/tar.git/commit/?id=18f90676e4695ffcf13413e9fbb24cc0ae2ae9d5
71
	local -x XZ_OPT= XZ_DEFAULTS=
72

  
73
	default
67 74
}
68 75

  
69 76
src_install() {
70 77
	default
71 78

  
72
	# a nasty yet required piece of baggage
79
	# A nasty yet required piece of baggage
73 80
	exeinto /etc
74 81
	doexe "${FILESDIR}"/rmt
75 82

  
......
91 98
}
92 99

  
93 100
pkg_postinst() {
94
	# ensure to preserve the symlink before app-alternatives/tar
101
	# Ensure to preserve the symlink before app-alternatives/tar
95 102
	# is installed
96 103
	if [[ ! -h ${EROOT}/bin/tar ]]; then
97 104
		if [[ -e ${EROOT}/usr/bin/tar ]] ; then
Thank you!