Diff rsync-3.4.3 with a rsync-3.5.0

/usr/portage/net-misc/rsync/rsync-3.5.0.ebuild 2026-08-14 20:03:04.409777987 +0300
5 5

  
6 6
# Uncomment when introducing a patch which touches configure
7 7
RSYNC_NEEDS_AUTOCONF=1
8
PYTHON_COMPAT=( python3_{11..14} )
8
PYTHON_COMPAT=( python3_{12..15} )
9 9
inherit flag-o-matic prefix python-single-r1 systemd
10 10

  
11 11
DESCRIPTION="File transfer program to keep remote files into sync"
12 12
HOMEPAGE="https://rsync.samba.org/"
13 13
if [[ ${PV} == *9999 ]] ; then
14
	EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
14
	EGIT_REPO_URI="https://github.com/RsyncProject/rsync.git"
15 15
	inherit autotools git-r3
16 16

  
17 17
	REQUIRED_USE="${PYTHON_REQUIRED_USE}"
......
25 25

  
26 26
	if [[ ${PV} == *_pre* ]] ; then
27 27
		SRC_DIR="src-previews"
28
		# Upstream make some private tarballs available for security releases
29
		# for testing.
30
		SRC_URI="
31
			${PN}-v${PV/_pre/-test}.tar.gz
32
			verify-sig? ( ${PN}-v${PV/_pre/-test}.tar.gz.asc )
33
		"
34
		S="${WORKDIR}"/${PN}-v${PV/_pre/-test}
35

  
36
		RESTRICT="fetch"
28 37
	else
29 38
		SRC_DIR="src"
30
		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
31
	fi
39
		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
32 40

  
33
	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
34
		verify-sig? ( https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc )"
35
	S="${WORKDIR}"/${P/_/}
41
		SRC_URI="
42
			https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
43
			https://github.com/RsyncProject/rsync/releases/download/v${PV}/${P/_/}.tar.gz
44
			verify-sig? (
45
				https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz.asc
46
				https://github.com/RsyncProject/rsync/releases/download/v${PV}/${P/_/}.tar.gz.asc
47
			)
48
		"
49
		S="${WORKDIR}"/${P/_/}
50
	fi
36 51
fi
37 52

  
38 53
LICENSE="GPL-3"
39 54
SLOT="0"
40
IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr +xxhash zstd"
41
REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
42
REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
55
IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib test xattr +xxhash zstd"
56
RESTRICT+=" !test? ( test )"
57
REQUIRED_USE+="
58
	examples? ( ${PYTHON_REQUIRED_USE} )
59
	rrsync? ( ${PYTHON_REQUIRED_USE} )
60
	test? ( ${PYTHON_REQUIRED_USE} )
61
"
43 62

  
44 63
RDEPEND="
45 64
	>=dev-libs/popt-1.19
46
	acl? ( virtual/acl )
65
	acl? ( >=virtual/acl-2.4.0 )
47 66
	examples? (
48 67
		${PYTHON_DEPS}
49 68
		dev-lang/perl
......
64 83
BDEPEND="
65 84
	examples? ( ${PYTHON_DEPS} )
66 85
	rrsync? ( ${PYTHON_DEPS} )
86
	test? ( ${PYTHON_DEPS} )
67 87
"
68 88

  
69 89
if [[ ${PV} == *9999 ]] ; then
70
	BDEPEND+=" ${PYTHON_DEPS}
90
	BDEPEND+="
91
		${PYTHON_DEPS}
71 92
		$(python_gen_cond_dep '
72 93
			dev-python/commonmark[${PYTHON_USEDEP}]
73
		')"
94
		')
95
	"
74 96
else
75 97
	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-andrewtridgell )"
76 98
fi
......
78 100
pkg_setup() {
79 101
	# - USE=examples needs Python itself at runtime, but nothing else
80 102
	# - 9999 needs commonmark at build time
81
	if [[ ${PV} == *9999 ]] || use examples || use rrsync; then
103
	if [[ ${PV} == *9999 ]] || use examples || use rrsync || use test ; then
82 104
		python-single-r1_pkg_setup
83 105
	fi
84 106
}
......
122 144
		$(use_enable zstd)
123 145
	)
124 146

  
125
	# https://github.com/WayneD/rsync/pull/428
126 147
	if is-flagq -fsanitize=undefined ; then
127
		sed -E -i \
128
			-e 's:#define CAREFUL_ALIGNMENT (0|1):#define CAREFUL_ALIGNMENT 1:' \
129
			byteorder.h || die
130 148
		append-flags -DCAREFUL_ALIGNMENT
131 149
	fi
132 150

  
Thank you!