6 files changed, 25 insertions, 7 deletions
diff --git a/llvm-runtimes/Manifest.gz b/llvm-runtimes/Manifest.gz
index 17f2b15e3c79..883b3c4ac08a 100644
--- a/llvm-runtimes/Manifest.gz
+++ b/llvm-runtimes/Manifest.gz
diff --git a/llvm-runtimes/offload/Manifest b/llvm-runtimes/offload/Manifest
index 0f0f5d4d3d36..73423fe20434 100644
--- a/llvm-runtimes/offload/Manifest
+++ b/llvm-runtimes/offload/Manifest
@@ -2,8 +2,8 @@ DIST llvm-project-19.1.6.src.tar.xz 141248428 BLAKE2B b35ab0c754f28c850ac6fd4ee5
 DIST llvm-project-19.1.6.src.tar.xz.sig 438 BLAKE2B 1791e98252ab78a9a762ef601ff9edee115385181781c8100f14ec80061d7888ee4c4c519297a0e89b9c7ab2203aa9d5bb3084ea1d0f0024c2acf84826fd370b SHA512 8e79a39a4f54da3579794f9b5a009ea8ee56c7bc1805187274794ce56e81aa492ea93f5c7839a59beedcf7d657acded5ecb75d5803658cce1f9e8f753439c6c4
 DIST llvm-project-32f7f0010bca99ee4bd917f57272733fb2bf3bd9.tar.gz 223983502 BLAKE2B fd3e6b0b795abc42568ef98fa774d927029c18838a5d0f34eaa66c37976444a63f2fc5d883f3bf3a98533f51e387936f1c659230f31c757d26153425696a16cd SHA512 65a345ad5b77c627008f759947e5e9f28a62c8992d7146113e0446e5849feaf9088c15c8b22ca0824af5b927d6a417f5326258b489fb8ccea78ec9e0e0fe8fba
 DIST llvm-project-49a5ad8e5714fd404210279303acc97b495d66d0.tar.gz 224456065 BLAKE2B 0077b9d37c479ac6190cc4b897cc35d6f1f3e6a772cd0620bcb1006afc19377e9968e38fb9d9adffe316e85290c9045deecbf9bf62b440c55968634b442edb31 SHA512 45d779eb27c230f656fda47c85127381cab8c8f7f75d77411c6960269f8aad5fa3c99c024a98ab8a349da1c88ad9d892cc82f91a6f344b791b281449031ae49a
-EBUILD offload-19.1.6.ebuild 4145 BLAKE2B b5b4ec8d30710cbb5f0b99ce8f62174935f4bb92d26a1d4e83cf7d523f7e955096b09c2baf3d8a326a8e36029124d4fd8f6ef1e7b53d715fb00b8ece25357511 SHA512 2019d1fb6d2c751caa7d2b9f376dbf41f1f568652d2392a64573388bfce3e6bd80019a56e38a0bb7c5a84f7ed652804b60455237b7982fcce1a1c12984bde059
-EBUILD offload-20.0.0.9999.ebuild 3745 BLAKE2B c83224e4b837481682439d576e42024e2caab14c068943fdb60997f8dd8c305279c2d1b1e3b1953b77f4840a1df723bde7ffba367ca45e1dc896f321610ba2b7 SHA512 78bc62063fa73cfbe02eed2f2491b597e8be1618221b794403f1299dc3e65706b356bdfbaf82d6d88a7044055a423029e85a951d5e3459ce617cf801e1f26f3d
-EBUILD offload-20.0.0_pre20241207.ebuild 4098 BLAKE2B c51babc0900e4f8640140590a177ae855b6b64a62f9d18b2fe03ef0f576c596f363cd4505c843c9a0a257e2906eedba73bc2c27682bccb00dac08e0d2f641945 SHA512 33a224a18cbc45b9195b0b9729a2b57121bdb1aa297ba3a394306e1edb3794ac805c260c86bbf01662c6cd80dbafb571a578ceaaf4cf6b8b1bb7205ec423bb91
-EBUILD offload-20.0.0_pre20241215.ebuild 3809 BLAKE2B 39eb12d570368f00643117f89a61cfe8780260e78c40ececc0f65d6654bf7b33f774cf67aa0362b1a4bdc2ed1e82cdb5371efda7a9c16dde60fef7c0f66ff29a SHA512 7d2146925c66d7ffafc6ee03761b57f147c18903b38f02ec7cf82c735c234843d05f4439e0e0553a35f9e69a446837531b4a215e8936beb550737071ded43aaa
+EBUILD offload-19.1.6.ebuild 4224 BLAKE2B 6f707fade4766b59bf1e4335858123c6107d3db971b5426e7eda1c2b2c7f2307b60de713afa50f639a7332613165f3f2e5dea6cc6f94e4a3c9f4bd9cc3d6e69d SHA512 3ef3af6e0dda90f597270da5eb76dfde0596298826872acc7bcc7a7e3a7b7b1e0e9ec6cdeb3835a1296380c39633d112fddf03f99ac62dc19b9b197e45e86a8a
+EBUILD offload-20.0.0.9999.ebuild 3881 BLAKE2B eb96a1c1848799d1b80c838b006b1253e218c3428f231b43b75db7d74560b46a8cfac3218584ee627bfb05858737720f3b568a6b08b3c3f18eb8853f6403215b SHA512 262abb8034966f1923877fd462c20f30846d911fce5c13ad49cf73f9b98b7d19e2f59fc262ad090c14034b411cf9ee41cc5a2d11bdbbb260640148028ef2195a
+EBUILD offload-20.0.0_pre20241207.ebuild 4178 BLAKE2B 5e84acbcab339b63d321f74a04242fca5d8bc92339acbc2bb15a4d5b6ef0a05fbad17eeefbb275eab1402a1745f0f59978d9e0887020d88350c9bf71d49d044d SHA512 dd8d141c4d184b11e8d9bbe045321c9b05fb197882861013d6b7f7f8a887505fb8e36c80829b940ce730fc37371b01036c56fd824c6ba4fa1d144d11b4f212aa
+EBUILD offload-20.0.0_pre20241215.ebuild 3881 BLAKE2B eb96a1c1848799d1b80c838b006b1253e218c3428f231b43b75db7d74560b46a8cfac3218584ee627bfb05858737720f3b568a6b08b3c3f18eb8853f6403215b SHA512 262abb8034966f1923877fd462c20f30846d911fce5c13ad49cf73f9b98b7d19e2f59fc262ad090c14034b411cf9ee41cc5a2d11bdbbb260640148028ef2195a
 MISC metadata.xml 379 BLAKE2B 2b4c75d4ec6e126d887b736ea978c4b34683a347252f408c9d1f5f55c6c1bead7b7f9533812806f816538d8abaa00ded4d439dbe626d3f2cf09b78a3674e41bd SHA512 d49054d4b5a1a051d83f1ef397a7925fb36ee3092668d134e6ed5c1218bf5d67a43145b689709677643da070a783ec9f8705b37f15587475829fe185634af1d4
diff --git a/llvm-runtimes/offload/offload-19.1.6.ebuild b/llvm-runtimes/offload/offload-19.1.6.ebuild
index dfd8e699dfa1..7c7f2f70cb2c 100644
--- a/llvm-runtimes/offload/offload-19.1.6.ebuild
+++ b/llvm-runtimes/offload/offload-19.1.6.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="+debug ompt test llvm_targets_AMDGPU llvm_targets_NVPTX"
 RESTRICT="!test? ( test )"
 
@@ -58,6 +58,10 @@ pkg_pretend() {
 	fi
 }
 
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if use test; then
 		python-any-r1_pkg_setup
@@ -99,7 +103,7 @@ src_configure() {
 	fi
 
 	local mycmakeargs=(
-		-DCMAKE_PREFIX_PATH="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
 
 		-DOFFLOAD_LIBDIR_SUFFIX="${libdir#lib}"
 		-DLIBOMPTARGET_PLUGINS_TO_BUILD="${plugins}"
diff --git a/llvm-runtimes/offload/offload-20.0.0.9999.ebuild b/llvm-runtimes/offload/offload-20.0.0.9999.ebuild
index 66a73775d296..a10cab67956c 100644
--- a/llvm-runtimes/offload/offload-20.0.0.9999.ebuild
+++ b/llvm-runtimes/offload/offload-20.0.0.9999.ebuild
@@ -56,6 +56,10 @@ pkg_pretend() {
 	fi
 }
 
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if use test; then
 		python-any-r1_pkg_setup
@@ -93,6 +97,8 @@ src_configure() {
 	fi
 
 	local mycmakeargs=(
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+
 		-DOFFLOAD_LIBDIR_SUFFIX="${libdir#lib}"
 		-DLIBOMPTARGET_PLUGINS_TO_BUILD="${plugins}"
 		-DLIBOMPTARGET_OMPT_SUPPORT="$(usex ompt)"
diff --git a/llvm-runtimes/offload/offload-20.0.0_pre20241207.ebuild b/llvm-runtimes/offload/offload-20.0.0_pre20241207.ebuild
index d84cc7993b0f..952dcc45c03b 100644
--- a/llvm-runtimes/offload/offload-20.0.0_pre20241207.ebuild
+++ b/llvm-runtimes/offload/offload-20.0.0_pre20241207.ebuild
@@ -57,6 +57,10 @@ pkg_pretend() {
 	fi
 }
 
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if use test; then
 		python-any-r1_pkg_setup
diff --git a/llvm-runtimes/offload/offload-20.0.0_pre20241215.ebuild b/llvm-runtimes/offload/offload-20.0.0_pre20241215.ebuild
index 0b726cf49fa7..a10cab67956c 100644
--- a/llvm-runtimes/offload/offload-20.0.0_pre20241215.ebuild
+++ b/llvm-runtimes/offload/offload-20.0.0_pre20241215.ebuild
@@ -56,6 +56,10 @@ pkg_pretend() {
 	fi
 }
 
+python_check_deps() {
+	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if use test; then
 		python-any-r1_pkg_setup
@@ -93,7 +97,7 @@ src_configure() {
 	fi
 
 	local mycmakeargs=(
-		-DCMAKE_PREFIX_PATH="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
+		-DLLVM_ROOT="${ESYSROOT}/usr/lib/llvm/${LLVM_MAJOR}"
 
 		-DOFFLOAD_LIBDIR_SUFFIX="${libdir#lib}"
 		-DLIBOMPTARGET_PLUGINS_TO_BUILD="${plugins}"