From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D67A5158020 for ; Wed, 23 Nov 2022 07:58:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B2F7E0990; Wed, 23 Nov 2022 07:58:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0041E0990 for ; Wed, 23 Nov 2022 07:58:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 03768340FCF for ; Wed, 23 Nov 2022 07:58:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 77CF354C for ; Wed, 23 Nov 2022 07:58:55 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1669190315.da4d9a9587d97464097bef47fcfcbae59ab8319c.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/rsync/metadata.xml net-misc/rsync/rsync-3.2.7-r1.ebuild net-misc/rsync/rsync-3.2.7.ebuild X-VCS-Directories: net-misc/rsync/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: da4d9a9587d97464097bef47fcfcbae59ab8319c X-VCS-Branch: master Date: Wed, 23 Nov 2022 07:58:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9856a275-2f63-4e0d-8c1e-31b7e1d27ef1 X-Archives-Hash: 06d5e165f9c57345ab517df66e224ebf commit: da4d9a9587d97464097bef47fcfcbae59ab8319c Author: Florian Schmaus gentoo org> AuthorDate: Tue Nov 22 15:53:48 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Wed Nov 23 07:58:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da4d9a95 net-misc/rsync: add rrsync USE flag Closes: https://bugs.gentoo.org/882579 Closes: https://github.com/gentoo/gentoo/pull/28385 Signed-off-by: Florian Schmaus gentoo.org> net-misc/rsync/metadata.xml | 1 + .../{rsync-3.2.7.ebuild => rsync-3.2.7-r1.ebuild} | 27 ++++++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) 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 @@ WayneD/rsync + Install rrsync script to setup restricted rsync users via ssh logins Provide helper scripts for using rsync via >=net-misc/stunnel-4 Use system zlib instead of bundled one. This is incompatible with older rsync releases! Enable dev-libs/xxhash support for hashing diff --git a/net-misc/rsync/rsync-3.2.7.ebuild b/net-misc/rsync/rsync-3.2.7-r1.ebuild similarity index 84% rename from net-misc/rsync/rsync-3.2.7.ebuild rename to net-misc/rsync/rsync-3.2.7-r1.ebuild index 804909ae11e6..0eda11f3670f 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 ~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/*