gentoo auto-resync : 23:11:2022 - 13:08:35

3 files changed, 25 insertions, 7 deletions

diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index 28002ecb5270..c04e68d8cf0c 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -13,6 +13,6 @@ DIST rsync-3.2.7.tar.gz 1149787 BLAKE2B 1b910b321e8d6b49af9f26bef813509f0da12ded
 DIST rsync-3.2.7.tar.gz.asc 195 BLAKE2B d2bca9276d9a0c96a9156a8da60e391f58eceb2e1ffaa51b7e7ffd592feaba3ce54772bd563a251e3b30efb0ad07fc96da01158a77dd77c6534eac5d80b46e53 SHA512 bad9f48e033966566c6abf8cd485d35c0d9cf130eafb0c5fff9bcb928882283bbcdd2375e7c2880cf71cf81496ba6b743b61adca3d4678421c32915a2464acc3
 EBUILD rsync-3.2.4-r3.ebuild 4766 BLAKE2B 2c5a0c4bd2f5f600cec463fe3d5a41cd4f9908ec5ead8e19a52a29108ad25be43cb6da3eb3f04fb0aafb9efb0bcc33e66d6b6f3450ce59a922d21db533d5f87d SHA512 482dee5328c886e9103a4d0a7d05e7bb258f12093f2dd530eef427714dd7f80ffbff821c4104783c066a7178efbe46da7d86101d74fb094c46f32ee411db22d2
 EBUILD rsync-3.2.6.ebuild 4515 BLAKE2B 89f5ad14e0dd506830dae96014566274a70b09b8d66215174dbe15c609075e2cdb179f83b20acde4170bd0c9b2707fa1e9b81a5bd6792d7913f60c5ece06532e SHA512 ebf536d851b3da99859f080e322147ac3438e90b06ea01148698bd22b4269ba4ccd84fc8b7217188010ab8e20ce3f92ff86a245de4aa7013ba500a93b620faf8
-EBUILD rsync-3.2.7.ebuild 4515 BLAKE2B 89f5ad14e0dd506830dae96014566274a70b09b8d66215174dbe15c609075e2cdb179f83b20acde4170bd0c9b2707fa1e9b81a5bd6792d7913f60c5ece06532e SHA512 ebf536d851b3da99859f080e322147ac3438e90b06ea01148698bd22b4269ba4ccd84fc8b7217188010ab8e20ce3f92ff86a245de4aa7013ba500a93b620faf8
+EBUILD rsync-3.2.7-r1.ebuild 4892 BLAKE2B ae321b55f7ad24f5e6391aecdc19ba5fff39b57b9303f7d65ddd7c92dbeca379c128a9ed1795216269d1854d55b7518589412fb7effe422fce6bdf6015f9bf17 SHA512 ba019db85f01b14ee524ee445eec64cb0612a67f3f99364a54d603b7d986d6b014d08149661ba2729a0d429b1bfcfe945b231e73aa52dac4bed2a35fbbc58430
 EBUILD rsync-9999.ebuild 4515 BLAKE2B 89f5ad14e0dd506830dae96014566274a70b09b8d66215174dbe15c609075e2cdb179f83b20acde4170bd0c9b2707fa1e9b81a5bd6792d7913f60c5ece06532e SHA512 ebf536d851b3da99859f080e322147ac3438e90b06ea01148698bd22b4269ba4ccd84fc8b7217188010ab8e20ce3f92ff86a245de4aa7013ba500a93b620faf8
-MISC metadata.xml 782 BLAKE2B 678fe6284d94d9a24535c21cc203b41ce0aaade030189fd3284e40976057ae5358e8ab8fbbacc2582ee9b0ac62e07ef090edb0eeeab915ed7aa126b282c7c382 SHA512 5febc4501ca953544c1ee6d138ab2abd97f72f7aa09ae3eb889740754cf77e0c89f5ea9c4adde5c5da65b243f3b06641e1c3e637fc6b503261a0665f5a853033
+MISC metadata.xml 880 BLAKE2B b079b9b9cb5dcc93b50d49fa50723729b7c57c34ad0cdfd946821089a1f9788a460818cef8d6a4e9f603ad066f6b3a0c22c7becb950abc1eac8e2923adf18bac SHA512 215f0df65f53e2aca8d519c85111f87e95d592454b8a297f69058c1d87ff5650f32f3c937715c8a83dc9bef1ca1e70589cd3797ca595688806c1067462717c14
diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml
index 99f88ebaf252..4dd797f7c406 100644
--- a/net-misc/rsync/metadata.xml
+++ b/net-misc/rsync/metadata.xml
@@ -11,6 +11,7 @@
 		<remote-id type="github">WayneD/rsync</remote-id>
 	</upstream>
 	<use>
+		<flag name="rrsync">Install rrsync script to setup restricted rsync users via ssh logins</flag>
 		<flag name="stunnel">Provide helper scripts for using rsync via &gt;=<pkg>net-misc/stunnel</pkg>-4</flag>
 		<flag name="system-zlib">Use system zlib instead of bundled one. This is incompatible with older rsync releases!</flag>
 		<flag name="xxhash">Enable <pkg>dev-libs/xxhash</pkg> support for hashing</flag>
diff --git a/net-misc/rsync/rsync-3.2.7.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild
index 804909ae11e6..82811728c290 100644
--- a/net-misc/rsync/rsync-3.2.7.ebuild
+++ b/net-misc/rsync/rsync-3.2.7-r1.ebuild
@@ -27,7 +27,7 @@ else
 		SRC_DIR="src-previews"
 	else
 		SRC_DIR="src"
-		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"
+		KEYWORDS="~alpha ~amd64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 
 	SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz
@@ -37,8 +37,9 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="acl examples iconv lz4 ssl stunnel system-zlib xattr xxhash zstd"
+IUSE="acl examples iconv lz4 rrsync ssl stunnel system-zlib xattr xxhash zstd"
 REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE+=" rrsync? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	>=dev-libs/popt-1.5
@@ -48,6 +49,12 @@ RDEPEND="
 		dev-lang/perl
 	)
 	lz4? ( app-arch/lz4:= )
+	rrsync? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/bracex[${PYTHON_USEDEP}]
+		')
+	)
 	ssl? ( dev-libs/openssl:= )
 	system-zlib? ( sys-libs/zlib )
 	xattr? ( kernel_linux? ( sys-apps/attr ) )
@@ -55,7 +62,10 @@ RDEPEND="
 	zstd? ( >=app-arch/zstd-1.4:= )
 	iconv? ( virtual/libiconv )"
 DEPEND="${RDEPEND}"
-BDEPEND="examples? ( ${PYTHON_DEPS} )"
+BDEPEND="
+	examples? ( ${PYTHON_DEPS} )
+	rrsync? ( ${PYTHON_DEPS} )
+"
 
 if [[ ${PV} == *9999 ]] ; then
 	BDEPEND+=" ${PYTHON_DEPS}
@@ -69,7 +79,7 @@ fi
 pkg_setup() {
 	# - USE=examples needs Python itself at runtime, but nothing else
 	# - 9999 needs commonmark at build time
-	if [[ ${PV} == *9999 ]] || use examples ; then
+	if [[ ${PV} == *9999 ]] || use examples || use rrsync; then
 		python-single-r1_pkg_setup
 	fi
 }
@@ -82,6 +92,10 @@ src_prepare() {
 		eautoconf -o configure.sh
 		eautoheader && touch config.h.in
 	fi
+
+	if use examples || use rrsync; then
+		python_fix_shebang support/
+	fi
 }
 
 src_configure() {
@@ -92,6 +106,7 @@ src_configure() {
 		$(use_enable acl acl-support)
 		$(use_enable iconv)
 		$(use_enable lz4)
+		$(use_with rrsync)
 		$(use_enable ssl openssl)
 		$(use_with !system-zlib included-zlib)
 		$(use_enable xattr xattr-support)
@@ -126,7 +141,9 @@ src_install() {
 
 	# Install the useful contrib scripts
 	if use examples ; then
-		python_fix_shebang support/
+		# The 'rrsync' script is installed conditionally via the 'rrysnc'
+		# USE flag, and not via the 'examples' USE flag.
+		rm support/rrsync* || die
 
 		exeinto /usr/share/rsync
 		doexe support/*