commit: 8107c14466ec0e8575c7dbd08915d89157874560 Author: Itai Ferber <itai <AT> itaiferber <DOT> net> AuthorDate: Mon Oct 6 19:57:12 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Oct 6 21:33:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8107c144
net-p2p/resilio-sync: fetch distfiles in src_unpack Instead of fetching distfiles from a static `SRC_URI` using a generic name (conflicting with the existing Manifest on every update), we want to behave like a proper live ebuild and fetch the live assets in `src_unpack`. Closes: https://bugs.gentoo.org/963828 Signed-off-by: Itai Ferber <itai <AT> itaiferber.net> Part-of: https://github.com/gentoo/gentoo/pull/44075 Signed-off-by: Sam James <sam <AT> gentoo.org> net-p2p/resilio-sync/Manifest | 2 -- net-p2p/resilio-sync/resilio-sync-9999.ebuild | 25 ++++++++++++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/net-p2p/resilio-sync/Manifest b/net-p2p/resilio-sync/Manifest index 43874eecec70..0b3299014c25 100644 --- a/net-p2p/resilio-sync/Manifest +++ b/net-p2p/resilio-sync/Manifest @@ -3,5 +3,3 @@ DIST resilio-sync-3.1.1.1075_x64.tar.gz 15534941 BLAKE2B f8ae232d24cd7d46564c4eb DIST resilio-sync_2.8.1.1390-1_amd64.deb 11895050 BLAKE2B 32ba64c4038948deb08a7fbf9b4daa78213cba1743ba559fb8bc88bda5665a1f5f368ed2bcdcaa96d1d3edf0a9e49ad5892ab16013c1483143ce4ceb5bfba31f SHA512 5ad8decad1d30e99368ad43a8a329573873e4189cf836c7e4161bf7ff4baa31c9d144498f3ee7e332a23930c178a704362b5fccbc498ea7d6066d0ee72ad8e82 DIST resilio-sync_2.8.1.1390-1_arm64.deb 11246080 BLAKE2B 3ab1a3f824c33d88c0d5009e60365e679432b0be0ed71caa6602bf49591ee2932cfe0ba26fcc32fcc841e61c9f29036e0c8922e1f0c4aef67a8b6a411d6a0af4 SHA512 4d4ef14ba5c10211b5fb06bb67ca0079aa3715b928b37630eaec98c0cf7cf3c1b27136969872a0b78a4ec4570de713a5665405abb8cd8dd793e3b13158992811 DIST resilio-sync_2.8.1.1390-1_armhf.deb 10988514 BLAKE2B 7c6d6226af1420714c01959875e637f87461a0012959b57e69ef591181245bfa04079da64597bc5a78f81a4992fd3ea6b955fe59491986c18cb8aa248cdd9094 SHA512 399c097a73217e5dd9a311a83d511189b01ec2d0a388c6a94c2ae62b3d79fcdbc117ab552127f8b81174271bc58c655d3bd0e762f21cf84b592117dfa9838b2b -DIST resilio-sync_arm64.tar.gz 15041201 BLAKE2B 755c6bdcdbaab5db5c8a72db77b426c57c6916d680737cc83a1480c27b8fcee02abdd70fd8e8e6295162751c18559c8b68ff8ce7e01b25f0a1b33ae8be89a947 SHA512 3c89ff400d071ff738433f91e3e9579e5cf1e2ee5f63e04f81c784432c6353f4d04a8aa5498cf03f76ad977d938d1ae09ada7edb9ad4ff44d654751de70cf90c -DIST resilio-sync_x64.tar.gz 15534941 BLAKE2B f8ae232d24cd7d46564c4eb02e04c371470de89853665c81de3aba44015b924fdc017c09943dbd6cda65b570cfed7c401f0646757632dd4f5e1071667031186c SHA512 0726ad0ad6815693311a9e6227e8086e016550265775f3e15f2419048c1bc8ac2d347c3b64f7365a67d3198e741e6d8c24681c0df6fec9afbdfd00928e55a97d diff --git a/net-p2p/resilio-sync/resilio-sync-9999.ebuild b/net-p2p/resilio-sync/resilio-sync-9999.ebuild index acf44b71b642..3a929672f728 100644 --- a/net-p2p/resilio-sync/resilio-sync-9999.ebuild +++ b/net-p2p/resilio-sync/resilio-sync-9999.ebuild @@ -3,16 +3,10 @@ EAPI=8 -inherit pax-utils readme.gentoo-r1 systemd tmpfiles - -BASE_URI="https://download-cdn.resilio.com/stable/linux/@arch@/0/${PN}_@[email protected]"; +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} ) -" S="${WORKDIR}" LICENSE="all-rights-reserved" @@ -26,6 +20,7 @@ RDEPEND=" acct-user/rslsync virtual/libcrypt:= " +BDEPEND="net-misc/wget" QA_PREBUILT="usr/bin/rslsync" @@ -33,6 +28,22 @@ 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() { + local base_uri="https://download-cdn.resilio.com/stable/linux/@arch@/0/${PN}_@[email protected]"; + 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}" || die + unpack "${dest}" +} + src_install() { dobin rslsync pax-mark m "${ED}"/usr/bin/rslsync
