Merge updates from master

7 files changed, 8 insertions, 40 deletions

diff --git a/app-containers/incus/incus-0.1-r2.ebuild b/app-containers/incus/incus-0.1-r2.ebuild
index b7d760e2001d..3f7bd4e3a5f5 100644
--- a/app-containers/incus/incus-0.1-r2.ebuild
+++ b/app-containers/incus/incus-0.1-r2.ebuild
@@ -174,6 +174,7 @@ pkg_postinst() {
 	optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs]
 	optfeature "btrfs storage backend" sys-fs/btrfs-progs
 	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
+	optfeature "full incus-migrate support" net-misc/rsync
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog
diff --git a/app-containers/lxd/Manifest b/app-containers/lxd/Manifest
index e1ebd6ab8100..76125c249aa7 100644
--- a/app-containers/lxd/Manifest
+++ b/app-containers/lxd/Manifest
@@ -2,7 +2,7 @@ DIST lxd-4.0.9.tar.gz 9117078 BLAKE2B aa6689c1e958258484fba5c060765dd71d5406cb43
 DIST lxd-4.0.9.tar.gz.asc 833 BLAKE2B 7cd0d3ab518d947ca3ea6dc804c6a59b592e4e568152c078fdd3c102420bcd94d2f0b2c335b8b4ecdb19dc3c9a10f665a1510903f395247da956717beaa172a3 SHA512 79a4111571ab43e79cf669e416ed50f3ccae0fbceb86d73757d23c778035e827f47643bc87ff6a2fc64b095345a3d53cbd0c4eb245c75364e907d7449f3a0886
 DIST lxd-5.0.2.tar.gz 16258766 BLAKE2B a0d4e3108664724c064fb8c16031ff7dfa3f49735c81290c78fca1dd8c95774e8d8faf131a9de0961a51fb3f1fb1e3a1219d325e6c440dc42d077bfb6550df0b SHA512 e44b210828251ef2bbdcca332f605294a9258572a52a8e94f5c8dcf8d5c2b3d4cdaf46f85236d9c963de5654d3a0437b5f177ea908a6dac3b5b03fb721be6eaa
 DIST lxd-5.0.2.tar.gz.asc 833 BLAKE2B 606cae1439148060acd3fb04fdb108654a351ce2b7484081f7874ab2b0af8de2b5befc5a5409a94af0da25308622234db2e3b411edb20324df458fe85f46ac21 SHA512 884c921a263a8baf2d94958c72e232a0a47d0747f5a9d36ed8fc270edfa18dfc240d1e858e75dcc03eae921dae08d3ddfd34d9146d1510de6a09031da26aaccc
-DIST lxd-5.17.tar.gz 22319517 BLAKE2B b9dfd934fad6b21b6f2b1d25291b4201f647b2b09a1ae155577a88257c021cc36b43a08802411d0f3268b726da7fa38b8627302696f670a1747e3795db0b0efe SHA512 f5feca34fff0b01a9db8041dd18fde82ad089f36ab171cf338556ebec9b2accfa450b0734d72b25bbb7296aaaeafed247aac2117c32f3ebfce5ae716e4b196bf
-DIST lxd-5.17.tar.gz.asc 833 BLAKE2B bc781d520b8314261b6681603f17fcb82d045bb969ebf8eec64c82ef73f493892d48d50c870f72e9f4f1f6c7dd4b63239a5039949e4f7bb49539c69538b4a2f2 SHA512 7e76a6cfcb1bf5b7b864125b412d5bd4766b4af6cdab40d70324c4103d1a716c39dfa5cf0eccf2cb7862f182c7c469f18ca46b981a1be3fc0fac8c47537d6c1c
 DIST lxd-5.18.tar.gz 22536474 BLAKE2B 44dabd50c137adde794ed266484a071d1aecff9300f8710d748a550415bd5f21b5f4ab40602f7b648cc05f9acc403782209636bdb8fe9720ff2808e8816aa27b SHA512 a9bdc276fb040413bad47579fb420951a007d725319c89abfde14062933267c7e5c67c546f2222905232231997a8f47fa097ed603d93dde2b9990b3e7018103f
 DIST lxd-5.18.tar.gz.asc 833 BLAKE2B 2eee2786d2930bce45b5f23943d3e9b0dab61595608a38077429585c3191476915d0ba7ef5eb05633a014dd92542cc5a5bfa70c4c0a63b94733297d37d78717e SHA512 959911019bffeca1cddae6b44c65b2cdbd71658cf9f714e41dd3de755629aedc0e8de196dac6ba0de0f27247e859f7090dc23edf4896e7a6c028b87e3665a5e2
+DIST lxd-5.19.tar.gz 22506800 BLAKE2B 94940a9e886d005495f8888d4491e5a8f8beee60c44051c767d32fd3dead9a93c1e546c0117207aefb60280a289d464615fba7e80385df23f397388a88be1386 SHA512 11d712245fc9cb77e7eabc748cfac38c1936be1c49b8dc4a2a7ebc06d0797f4d0d728b275cee27f9c2c64bc13275fc29ac57fc8d0dce9c24d6636b51248e9b4f
+DIST lxd-5.19.tar.gz.asc 833 BLAKE2B 591f12c8e93199061b588bdffded5d159f714d91c68a0d8003590bc672cec787418611f0597fe8e137b3c2b61e8171ca6393db912b8f55ded39db934d55d3df1 SHA512 2337d42f0a7dfdbb2870511442f05e1dd9c214e1b0d96b20ee677a3a345bf41c15c0b1cb0d42ddd15766813e4ae405577f8b49fa60fdc541fb3db35c0bc569ed
diff --git a/app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch b/app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch
deleted file mode 100644
index b0e3a7500b89..000000000000
--- a/app-containers/lxd/files/lxd-5.17-remove-shellcheck-buildsystem-checks.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -249,28 +249,6 @@ endif
- .PHONY: build-mo
- build-mo: $(MOFILES)
- 
--.PHONY: static-analysis
--static-analysis:
--ifeq ($(shell command -v golangci-lint),)
--	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin
--endif
--ifeq ($(shell command -v shellcheck),)
--	echo "Please install shellcheck"
--	exit 1
--endif
--ifneq "$(shell shellcheck --version | grep version: | cut -d ' ' -f2)" "0.8.0"
--	@echo "WARN: shellcheck version is not 0.8.0"
--endif
--ifeq ($(shell command -v flake8),)
--	echo "Please install flake8"
--	exit 1
--endif
--	golangci-lint run --timeout 5m
--	flake8 test/deps/import-busybox
--	shellcheck --shell sh test/*.sh test/includes/*.sh test/suites/*.sh test/backends/*.sh test/lint/*.sh
--	shellcheck test/extras/*.sh
--	run-parts --exit-on-error --regex '.sh' test/lint
--
- .PHONY: tags
- tags: *.go lxd/*.go shared/*.go lxc/*.go
- 	find . -type f -name '*.go' | xargs gotags > tags
diff --git a/app-containers/lxd/lxd-5.0.2-r3.ebuild b/app-containers/lxd/lxd-5.0.2-r3.ebuild
index 8d110b892d9d..f0c1f274db2c 100644
--- a/app-containers/lxd/lxd-5.0.2-r3.ebuild
+++ b/app-containers/lxd/lxd-5.0.2-r3.ebuild
@@ -182,7 +182,7 @@ pkg_postinst() {
 	optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs]
 	optfeature "btrfs storage backend" sys-fs/btrfs-progs
 	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-	optfeature "full lxd-migrate support"
+	optfeature "full lxd-migrate support" net-misc/rsync
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog
diff --git a/app-containers/lxd/lxd-5.18.ebuild b/app-containers/lxd/lxd-5.18.ebuild
index a7b9cee3c03f..d4b3da597693 100644
--- a/app-containers/lxd/lxd-5.18.ebuild
+++ b/app-containers/lxd/lxd-5.18.ebuild
@@ -184,7 +184,7 @@ pkg_postinst() {
 	optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs]
 	optfeature "btrfs storage backend" sys-fs/btrfs-progs
 	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-	optfeature "full lxd-migrate support"
+	optfeature "full lxd-migrate support" net-misc/rsync
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog
diff --git a/app-containers/lxd/lxd-5.17.ebuild b/app-containers/lxd/lxd-5.19.ebuild
index ea17b562f52c..681eaf740cbf 100644
--- a/app-containers/lxd/lxd-5.17.ebuild
+++ b/app-containers/lxd/lxd-5.19.ebuild
@@ -86,10 +86,6 @@ RESTRICT="test"
 
 GOPATH="${S}/_dist"
 
-PATCHES=(
-	"${FILESDIR}"/lxd-5.17-remove-shellcheck-buildsystem-checks.patch
-)
-
 src_prepare() {
 	export GOPATH="${S}/_dist"
 
@@ -184,7 +180,7 @@ pkg_postinst() {
 	optfeature "virtual machine support" app-emulation/qemu[spice,usbredir,virtfs]
 	optfeature "btrfs storage backend" sys-fs/btrfs-progs
 	optfeature "ipv6 support" net-dns/dnsmasq[ipv6]
-	optfeature "full lxd-migrate support"
+	optfeature "full lxd-migrate support" net-misc/rsync
 	optfeature "lvm2 storage backend" sys-fs/lvm2
 	optfeature "zfs storage backend" sys-fs/zfs
 	elog
diff --git a/dev-util/hipcc/hipcc-5.7.1.ebuild b/dev-util/hipcc/hipcc-5.7.1.ebuild
index 062d629e1a4c..14725bbfa1db 100644
--- a/dev-util/hipcc/hipcc-5.7.1.ebuild
+++ b/dev-util/hipcc/hipcc-5.7.1.ebuild
@@ -17,3 +17,5 @@ IUSE="debug test"
 RESTRICT="!test? ( test )"
 
 S=${WORKDIR}/HIPCC-rocm-${PV}
+
+DEPEND="!!<dev-util/hip-5.7"