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 17F4215808B for ; Sat, 16 Apr 2022 08:34:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 43C68E0993; Sat, 16 Apr 2022 08:34:39 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A5DBE0993 for ; Sat, 16 Apr 2022 08:34:39 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B2953418ED for ; Sat, 16 Apr 2022 08:34:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B6AD3A5 for ; Sat, 16 Apr 2022 08:34:36 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1650098056.3ca7f6278c1a408b646d5412b7231e6cb72cfb9c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/rsync/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/rsync/rsync-3.2.4-r1.ebuild net-misc/rsync/rsync-3.2.4.ebuild net-misc/rsync/rsync-9999.ebuild X-VCS-Directories: net-misc/rsync/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3ca7f6278c1a408b646d5412b7231e6cb72cfb9c X-VCS-Branch: master Date: Sat, 16 Apr 2022 08:34:36 +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: f63d0f93-6de5-40a3-9b8c-5beb01d8db11 X-Archives-Hash: 0938c685ab590df78cef16e9267b2b96 commit: 3ca7f6278c1a408b646d5412b7231e6cb72cfb9c Author: Sam James gentoo org> AuthorDate: Sat Apr 16 08:29:13 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Apr 16 08:34:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ca7f627 net-misc/rsync: fix shebang on examples scripts Signed-off-by: Sam James gentoo.org> .../{rsync-3.2.4.ebuild => rsync-3.2.4-r1.ebuild} | 27 +++++++++++++++++---- net-misc/rsync/rsync-9999.ebuild | 28 ++++++++++++++++------ 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/net-misc/rsync/rsync-3.2.4.ebuild b/net-misc/rsync/rsync-3.2.4-r1.ebuild similarity index 87% rename from net-misc/rsync/rsync-3.2.4.ebuild rename to net-misc/rsync/rsync-3.2.4-r1.ebuild index f3a4a1f6ee43..d172d6ec7259 100644 --- a/net-misc/rsync/rsync-3.2.4.ebuild +++ b/net-misc/rsync/rsync-3.2.4-r1.ebuild @@ -3,14 +3,16 @@ EAPI=7 -inherit flag-o-matic prefix systemd +PYTHON_COMPAT=( python3_{8,9,10} ) +inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" if [[ ${PV} == *9999 ]] ; then - PYTHON_COMPAT=( python3_{8,9,10} ) EGIT_REPO_URI="https://github.com/WayneD/rsync.git" - inherit autotools git-r3 python-any-r1 + inherit autotools git-r3 + + REQUIRED_USE="${PYTHON_REQUIRED_USE}" else VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc inherit verify-sig @@ -30,8 +32,13 @@ fi LICENSE="GPL-3" SLOT="0" IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) lz4? ( app-arch/lz4 ) ssl? ( dev-libs/openssl:0= ) system-zlib? ( sys-libs/zlib ) @@ -41,16 +48,25 @@ RDEPEND="acl? ( virtual/acl ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )" DEPEND="${RDEPEND}" +BDEPEND="examples? ( ${PYTHON_DEPS} )" if [[ ${PV} == *9999 ]] ; then BDEPEND+=" ${PYTHON_DEPS} - $(python_gen_any_dep ' + $(python_gen_cond_dep ' dev-python/commonmark[${PYTHON_USEDEP}] ')" else BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" 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 + python-single-r1_pkg_setup + fi +} + src_prepare() { default @@ -107,8 +123,11 @@ src_install() { # Install the useful contrib scripts if use examples ; then + python_fix_shebang support/ + exeinto /usr/share/rsync doexe support/* + rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} fi diff --git a/net-misc/rsync/rsync-9999.ebuild b/net-misc/rsync/rsync-9999.ebuild index a6b2f8bee049..d172d6ec7259 100644 --- a/net-misc/rsync/rsync-9999.ebuild +++ b/net-misc/rsync/rsync-9999.ebuild @@ -3,14 +3,16 @@ EAPI=7 -inherit flag-o-matic prefix systemd +PYTHON_COMPAT=( python3_{8,9,10} ) +inherit flag-o-matic prefix python-single-r1 systemd DESCRIPTION="File transfer program to keep remote files into sync" HOMEPAGE="https://rsync.samba.org/" if [[ ${PV} == *9999 ]] ; then - PYTHON_COMPAT=( python3_{8,9,10} ) EGIT_REPO_URI="https://github.com/WayneD/rsync.git" - inherit autotools git-r3 python-any-r1 + inherit autotools git-r3 + + REQUIRED_USE="${PYTHON_REQUIRED_USE}" else VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/waynedavison.asc inherit verify-sig @@ -30,8 +32,13 @@ fi LICENSE="GPL-3" SLOT="0" IUSE="acl examples iconv ipv6 lz4 ssl stunnel system-zlib xattr xxhash zstd" +REQUIRED_USE+=" examples? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="acl? ( virtual/acl ) + examples? ( + ${PYTHON_DEPS} + dev-lang/perl + ) lz4? ( app-arch/lz4 ) ssl? ( dev-libs/openssl:0= ) system-zlib? ( sys-libs/zlib ) @@ -41,19 +48,23 @@ RDEPEND="acl? ( virtual/acl ) >=dev-libs/popt-1.5 iconv? ( virtual/libiconv )" DEPEND="${RDEPEND}" +BDEPEND="examples? ( ${PYTHON_DEPS} )" if [[ ${PV} == *9999 ]] ; then BDEPEND+=" ${PYTHON_DEPS} - $(python_gen_any_dep ' + $(python_gen_cond_dep ' dev-python/commonmark[${PYTHON_USEDEP}] ')" else BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-waynedavison )" fi -# Only required for live ebuild -python_check_deps() { - has_version -b "dev-python/commonmark[${PYTHON_USEDEP}]" +pkg_setup() { + # - USE=examples needs Python itself at runtime, but nothing else + # - 9999 needs commonmark at build time + if [[ ${PV} == *9999 ]] || use examples ; then + python-single-r1_pkg_setup + fi } src_prepare() { @@ -112,8 +123,11 @@ src_install() { # Install the useful contrib scripts if use examples ; then + python_fix_shebang support/ + exeinto /usr/share/rsync doexe support/* + rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c} fi