From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id 3E49A158176 for ; Mon, 06 Oct 2025 21:33:52 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 2A8FF3410DE for ; Mon, 06 Oct 2025 21:33:52 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 043691103B8; Mon, 06 Oct 2025 21:33:45 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id EB4291103B8 for ; Mon, 06 Oct 2025 21:33:44 +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 9B8D93410D1 for ; Mon, 06 Oct 2025 21:33:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC54D3AC8 for ; Mon, 06 Oct 2025 21:33:42 +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: <1759786381.99ee5d2fbdbc149da2b9f46c69f66bea9d16bb15.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/resilio-sync/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/resilio-sync/resilio-sync-3.1.1.1075.ebuild net-p2p/resilio-sync/resilio-sync-9999.ebuild X-VCS-Directories: net-p2p/resilio-sync/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 99ee5d2fbdbc149da2b9f46c69f66bea9d16bb15 X-VCS-Branch: master Date: Mon, 06 Oct 2025 21:33:42 +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: 182007f4-03bd-471b-8bf2-12032d40a463 X-Archives-Hash: 0f095280683ee848003b1aad1fda715c commit: 99ee5d2fbdbc149da2b9f46c69f66bea9d16bb15 Author: Itai Ferber itaiferber net> AuthorDate: Mon Oct 6 20:49:22 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Oct 6 21:33:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99ee5d2f net-p2p/resilio-sync: live-template ebuild Now that `-9999` uses live-downloading, it's worth refactoring it as a live template to base future versions off of; replaces `3.1.1.1075` with this template. Signed-off-by: Itai Ferber itaiferber.net> Part-of: https://github.com/gentoo/gentoo/pull/44075 Closes: https://github.com/gentoo/gentoo/pull/44075 Signed-off-by: Sam James gentoo.org> .../resilio-sync/resilio-sync-3.1.1.1075.ebuild | 41 +++++++++++++++++----- net-p2p/resilio-sync/resilio-sync-9999.ebuild | 40 ++++++++++++++------- 2 files changed, 60 insertions(+), 21 deletions(-) diff --git a/net-p2p/resilio-sync/resilio-sync-3.1.1.1075.ebuild b/net-p2p/resilio-sync/resilio-sync-3.1.1.1075.ebuild index d1580bc23246..5015be931c7f 100644 --- a/net-p2p/resilio-sync/resilio-sync-3.1.1.1075.ebuild +++ b/net-p2p/resilio-sync/resilio-sync-3.1.1.1075.ebuild @@ -3,21 +3,26 @@ EAPI=8 -inherit pax-utils readme.gentoo-r1 systemd tmpfiles - -BASE_URI="https://download-cdn.resilio.com/${PV}/linux/@arch@/0/${PN}_@arch@.tar.gz -> ${P}_@arch@.tar.gz" +inherit edo pax-utils readme.gentoo-r1 systemd tmpfiles DESCRIPTION="Resilient, fast and scalable file synchronization tool" HOMEPAGE="https://www.resilio.com" -SRC_URI=" - amd64? ( ${BASE_URI//@arch@/x64} ) - arm64? ( ${BASE_URI//@arch@/arm64} ) -" + +if [[ ${PV} == 9999 ]]; then + BDEPEND="net-misc/wget" + PROPERTIES="live" +else + BASE_URI="https://download-cdn.resilio.com/${PV}/linux/@arch@/0/${PN}_@arch@.tar.gz -> ${P}_@arch@.tar.gz" + SRC_URI=" + amd64? ( ${BASE_URI//@arch@/x64} ) + arm64? ( ${BASE_URI//@arch@/arm64} ) + " + KEYWORDS="-* ~amd64 ~arm64" +fi S="${WORKDIR}" LICENSE="all-rights-reserved" SLOT="0" -KEYWORDS="-* ~amd64 ~arm64" RESTRICT="bindist mirror" @@ -33,6 +38,26 @@ DOC_CONTENTS="You may need to review /etc/resilio-sync/config.json\\n Default metadata path is /var/lib/resilio-sync/.sync\\n Default web-gui URL is http://localhost:8888/\\n\\n" +src_unpack() { + if [[ ${PV} == 9999 ]]; then + local base_uri="https://download-cdn.resilio.com/stable/linux/@arch@/0/${PN}_@arch@.tar.gz" + local uri + if use amd64; then + uri="${base_uri//@arch@/x64}" + elif use arm64; then + uri="${base_uri//@arch@/arm64}" + else + die "arch not supported" + fi + + local dest="${T}/${PN}.tar.gz" + edo wget -O "${dest}" "${uri}" + unpack "${dest}" + else + default + fi +} + src_install() { dobin rslsync pax-mark m "${ED}"/usr/bin/rslsync diff --git a/net-p2p/resilio-sync/resilio-sync-9999.ebuild b/net-p2p/resilio-sync/resilio-sync-9999.ebuild index 3a929672f728..5015be931c7f 100644 --- a/net-p2p/resilio-sync/resilio-sync-9999.ebuild +++ b/net-p2p/resilio-sync/resilio-sync-9999.ebuild @@ -8,11 +8,22 @@ inherit edo pax-utils readme.gentoo-r1 systemd tmpfiles DESCRIPTION="Resilient, fast and scalable file synchronization tool" HOMEPAGE="https://www.resilio.com" +if [[ ${PV} == 9999 ]]; then + BDEPEND="net-misc/wget" + PROPERTIES="live" +else + BASE_URI="https://download-cdn.resilio.com/${PV}/linux/@arch@/0/${PN}_@arch@.tar.gz -> ${P}_@arch@.tar.gz" + SRC_URI=" + amd64? ( ${BASE_URI//@arch@/x64} ) + arm64? ( ${BASE_URI//@arch@/arm64} ) + " + KEYWORDS="-* ~amd64 ~arm64" +fi + S="${WORKDIR}" LICENSE="all-rights-reserved" SLOT="0" -PROPERTIES="live" RESTRICT="bindist mirror" RDEPEND=" @@ -20,7 +31,6 @@ RDEPEND=" acct-user/rslsync virtual/libcrypt:= " -BDEPEND="net-misc/wget" QA_PREBUILT="usr/bin/rslsync" @@ -29,19 +39,23 @@ Default metadata path is /var/lib/resilio-sync/.sync\\n Default web-gui URL is http://localhost:8888/\\n\\n" src_unpack() { - local base_uri="https://download-cdn.resilio.com/stable/linux/@arch@/0/${PN}_@arch@.tar.gz" - local uri - if use amd64; then - uri="${base_uri//@arch@/x64}" - elif use arm64; then - uri="${base_uri//@arch@/arm64}" + if [[ ${PV} == 9999 ]]; then + local base_uri="https://download-cdn.resilio.com/stable/linux/@arch@/0/${PN}_@arch@.tar.gz" + local uri + if use amd64; then + uri="${base_uri//@arch@/x64}" + elif use arm64; then + uri="${base_uri//@arch@/arm64}" + else + die "arch not supported" + fi + + local dest="${T}/${PN}.tar.gz" + edo wget -O "${dest}" "${uri}" + unpack "${dest}" else - die "arch not supported" + default fi - - local dest="${T}/${PN}.tar.gz" - edo wget -O "${dest}" "${uri}" || die - unpack "${dest}" } src_install() {