Diff tor-0.4.7.14 with a tor-0.4.7.15

/usr/portage/net-vpn/tor/tor-0.4.7.15.ebuild 2023-10-09 14:52:34.772368483 +0300
5 5

  
6 6
PYTHON_COMPAT=( python3_{10..12} )
7 7
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/torproject.org.asc
8
inherit python-any-r1 readme.gentoo-r1 systemd verify-sig
8
inherit edo python-any-r1 readme.gentoo-r1 systemd verify-sig
9 9

  
10 10
MY_PV="$(ver_rs 4 -)"
11 11
MY_PF="${PN}-${MY_PV}"
......
28 28
	S="${WORKDIR}/${MY_PF}"
29 29

  
30 30
	if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
31
		KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~sparc x86 ~ppc-macos"
31
		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~ppc-macos"
32 32
	fi
33 33

  
34 34
	BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-tor-20230727 )"
......
41 41

  
42 42
DEPEND="
43 43
	>=dev-libs/libevent-2.1.12-r1:=[ssl]
44
	dev-libs/openssl:=[-bindist(-)]
44 45
	sys-libs/zlib
45 46
	caps? ( sys-libs/libcap )
46 47
	man? ( app-text/asciidoc )
47
	dev-libs/openssl:=[-bindist(-)]
48 48
	lzma? ( app-arch/xz-utils )
49 49
	scrypt? ( app-crypt/libscrypt )
50 50
	seccomp? ( >=sys-libs/libseccomp-2.4.1 )
51
	systemd? ( sys-apps/systemd )
52
	zstd? ( app-arch/zstd )
51
	systemd? ( sys-apps/systemd:= )
52
	zstd? ( app-arch/zstd:= )
53 53
"
54 54
RDEPEND="
55 55
	acct-user/tor
......
120 120
		--enable-pic
121 121
		--disable-restart-debugging
122 122

  
123
		# This option is enabled by default upstream w/ zstd, surprisingly.
124
		# zstd upstream says this shouldn't be relied upon and it may
125
		# break API & ABI at any point, so Tor tries to fake static-linking
126
		# to make it work, but then requires a rebuild on any new zstd version
127
		# even when its standard ABI hasn't changed.
128
		# See bug #727406 and bug #905708.
129
		--disable-zstd-advanced-apis
130

  
131 123
		$(use_enable man asciidoc)
132 124
		$(use_enable man manpage)
133 125
		$(use_enable lzma)
......
144 136
	econf "${myeconfargs[@]}"
145 137
}
146 138

  
139
src_test() {
140
	local skip_tests=(
141
		# Fails in sandbox
142
		:sandbox/open_filename
143
		:sandbox/openat_filename
144
	)
145

  
146
	# The makefile runs these by parallel by chunking them with a script
147
	# but that means we lose verbosity and can't skip individual tests easily
148
	# either.
149
	edo ./src/test/test --verbose "${skip_tests[@]}"
150
}
151

  
147 152
src_install() {
148 153
	default
149 154
	readme.gentoo_create_doc
Thank you!