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 64CEA15802E for ; Sat, 29 Jun 2024 16:51:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A85742BC040; Sat, 29 Jun 2024 16:51:18 +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 8A59E2BC040 for ; Sat, 29 Jun 2024 16:51:18 +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 A587F33E3A9 for ; Sat, 29 Jun 2024 16:51:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 45B971D0B for ; Sat, 29 Jun 2024 16:51:16 +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: <1719679753.d4f66b668bb1255e8935d962cdac30a1af9e00c6.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/blender/blender-4.1.1-r1.ebuild media-gfx/blender/blender-9999.ebuild X-VCS-Directories: media-gfx/blender/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d4f66b668bb1255e8935d962cdac30a1af9e00c6 X-VCS-Branch: master Date: Sat, 29 Jun 2024 16:51:16 +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: 003e12ae-020f-4761-9fc4-ec2138d63f61 X-Archives-Hash: 2bce32cb95653b485ec8c709bcea3414 commit: d4f66b668bb1255e8935d962cdac30a1af9e00c6 Author: Paul Zander gmail com> AuthorDate: Sat Jun 29 13:53:51 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jun 29 16:49:13 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4f66b66 media-gfx/blender: 4.1.1-r1, 9999 propagate LLVM_SLOT to hip Bug: https://bugs.gentoo.org/880671 Signed-off-by: Paul Zander gmail.com> Signed-off-by: Sam James gentoo.org> media-gfx/blender/blender-4.1.1-r1.ebuild | 9 ++++++++- media-gfx/blender/blender-9999.ebuild | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/media-gfx/blender/blender-4.1.1-r1.ebuild b/media-gfx/blender/blender-4.1.1-r1.ebuild index b4d0fa864c54..529d10261733 100644 --- a/media-gfx/blender/blender-4.1.1-r1.ebuild +++ b/media-gfx/blender/blender-4.1.1-r1.ebuild @@ -85,7 +85,14 @@ RDEPEND="${PYTHON_DEPS} fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) gnome? ( gui-libs/libdecor ) - hip? ( >=dev-util/hip-5.7:= ) + hip? ( + llvm_slot_17? ( + dev-util/hip:0/5.7= + ) + llvm_slot_18? ( + >=dev-util/hip-6.1:=[llvm_slot_18(-)] + ) + ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= ) diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild index b4d0fa864c54..529d10261733 100644 --- a/media-gfx/blender/blender-9999.ebuild +++ b/media-gfx/blender/blender-9999.ebuild @@ -85,7 +85,14 @@ RDEPEND="${PYTHON_DEPS} fftw? ( sci-libs/fftw:3.0= ) gmp? ( dev-libs/gmp ) gnome? ( gui-libs/libdecor ) - hip? ( >=dev-util/hip-5.7:= ) + hip? ( + llvm_slot_17? ( + dev-util/hip:0/5.7= + ) + llvm_slot_18? ( + >=dev-util/hip-6.1:=[llvm_slot_18(-)] + ) + ) jack? ( virtual/jack ) jemalloc? ( dev-libs/jemalloc:= ) jpeg2k? ( media-libs/openjpeg:2= )