gentoo auto-resync : 02:01:2025 - 06:31:11

8 files changed, 69 insertions, 214 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0b2f40e13c6c..98bcb6fc9ce7 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/edi/Manifest b/dev-util/edi/Manifest
index 5660f2614c63..6055ee512c9b 100644
--- a/dev-util/edi/Manifest
+++ b/dev-util/edi/Manifest
@@ -1,4 +1,5 @@
 AUX edi-0.8.0-meson-0.61.1-fix.patch 745 BLAKE2B 7eaff5755930079142923c58dcff4877184050ac4b6d058b2a52d1180a92e667f2424d40ff40cadd90201e97e8a4ed56e05f69f9c858da109e2d5c1e362bd08c SHA512 146b1b1c1f078ce21cb61c73874d9b8c5d9b9ee83031b3b85754e055d324e849a2e89cd52a935b052837647502b91e7d5d0712acdf220c4c545bfb5add459cb0
 DIST edi-0.8.0.tar.gz 1076134 BLAKE2B b422493a1786f6dd2865adfdc88d756e7ced7681d8ccfbb6d0befcf04b035435134b168752d47dc25f86b1ee59c659a23b04b392787f8863f772e90a5f6f55fb SHA512 88d4ff3f5a4c56c3de7392024022a505907b6d6a16854254f227e457157fd7abd35eff1916842c77fcd6b81d42ec2fa15deceee632bf67d22ab272f8e755215c
 EBUILD edi-0.8.0-r2.ebuild 1411 BLAKE2B 2fdfd24871f47fdafd2bfc0fb7e08c597883543a9f0fe128621a60ea9a6d0d0b7593c9321a51c9e5474a187302b1b487117625c67086ca15e7a31ae158139353 SHA512 76532ed1298214961e83fd786090c06f26b265f8237dc88ea187eaf7a3e7fa66a70c00d3173a14b5f3b21d076003a56722e48a94e4039c0ffb999fbf09b37f9a
+EBUILD edi-0.8.0-r3.ebuild 1472 BLAKE2B 2c0b1cc813b0af0556ae71fda4e8927313a6972659480c1db3dc0a1a3a1742a0269a4cb09a0534f5a56312822bc765c8366a7ed01f93f58a982c668c5c0f30dc SHA512 5b6a01e0ea3fd18dd61ffbd4bd901a666de68408d9b792b4c32b59aeb1458d43a64a500c41bbae8362e5522ad92c9713ca5bcc34e72748c2006c0c6988604bd0
 MISC metadata.xml 484 BLAKE2B f6fe9fcb6c9c876e5b108ca1eba1498ff024465dd15a236d50a2552dc012b98ff87012c15bcfc4e43d7c8bd1ba887c88bacc714dbd84a55cac9f79faee80dbdd SHA512 bbf9e2c7be15961ce8c0fe78c63e0b972aa48705d612fa180038a4e2226f1e2f2b5d613c7779be2dec42babe97176edaaa45259b974881f8eabd99ee19ed79ea
diff --git a/dev-util/edi/edi-0.8.0-r3.ebuild b/dev-util/edi/edi-0.8.0-r3.ebuild
new file mode 100644
index 000000000000..ccd558fbace2
--- /dev/null
+++ b/dev-util/edi/edi-0.8.0-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( 18 19 )
+
+inherit llvm-r2 meson xdg
+
+DESCRIPTION="An EFL-based IDE"
+HOMEPAGE="https://www.enlightenment.org/about-edi
+	https://phab.enlightenment.org/w/projects/edi/
+	https://github.com/Enlightenment/edi"
+SRC_URI="https://github.com/Enlightenment/edi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3 LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang"
+
+RDEPEND="|| ( dev-libs/efl[X] dev-libs/efl[wayland] )
+	>=dev-libs/efl-1.22.0[eet]
+	clang? (
+		dev-util/bear
+		$(llvm_gen_dep 'llvm-core/clang:${LLVM_SLOT}=')
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/check"
+BDEPEND="virtual/libintl
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/edi-0.8.0-meson-0.61.1-fix.patch )
+
+llvm_check_deps() {
+	has_version "llvm-core/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use clang && llvm-r2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# fix a QA issue with .desktop file, https://phab.enlightenment.org/T7368
+	sed -i '/Version=/d' data/desktop/edi.desktop* || die
+
+	# fix 'unexpected path' QA warning
+	sed -i 's|share/doc/edi/|share/doc/'${PF}'/|g' doc/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use clang bear)
+		$(meson_use clang libclang)
+	)
+
+	if use clang; then
+		emesonargs+=(
+			-D libclang-headerdir="$(llvm-config --includedir)"
+			-D libclang-libdir="$(llvm-config --libdir)"
+		)
+	fi
+
+	meson_src_configure
+}
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index d1f0432c2aa2..dc0be1aa7e2c 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -10,4 +10,4 @@ EBUILD pycharm-community-2023.1.1.ebuild 3144 BLAKE2B 7db808cf672035782d54e62394
 EBUILD pycharm-community-2024.1.4.ebuild 3341 BLAKE2B 3d931e55bbb05e74810983c7528de4c5cfa99f60b1425ba8fdd4e1f18cd2f9f50c84d1944ae9209dac43cebd6dab7c6927e27ca74ad6999be3b1077d52d87191 SHA512 5978888e24d1a797f1d27920775b87c5259c266b593a0a7bd2137ca340d08d5f69d4a86ff5a83cced981ced737f8e8e831f57f171670d3a714e42fd5b7e533c4
 EBUILD pycharm-community-2024.2.1.ebuild 3356 BLAKE2B d7815f4f17d84eaf02e6f05c3e16ee65d00daae27e7a92e23cba7bccb368e4452f0d3d6fb5cefafc3e2246eac4f5a7f2a5cedc90a1eab9c060156af0b5ea1652 SHA512 10df39cedad1e5528872824e22e04791ed0e9edbe3c3592a9d0d0f0ea1fd0e2de720d3dccd9ed2339f9dac64c25750bd279c491269a575f4051c53693a99b779
 EBUILD pycharm-community-2024.3-r1.ebuild 5220 BLAKE2B 548692ef25bf96b60c6768c3ccd68603ff666fb68693c38518927c0fccc4fbab4f2b2a893f3cf332fabfd5c7446631f7a7631569364197dbf643de51823e6e10 SHA512 f96b77d65f65029bd58387e6e7806a43797341165e488a12197b3742dd53ef07f5d72eea56aa2099d2da9103d9265e802ed8d44e843c7848cc1bc3edf00955cc
-MISC metadata.xml 305 BLAKE2B a5ee9ceb727e22160e23fc785ddcf2b7b22afd9599e956de38bf4318c4cab2acf5cffa6d1f075ac24d866d407e9412ba02362c9942b3aa34a7276e55cc44f161 SHA512 e67f65a2f5fcb0c7a7bfecdbba77c91844e89f4110ec66bb5838fdf7fb5abb57d141c2a816b7867001fc919c8721fd7837705b9a4f8853ce0728e33096fee19f
+MISC metadata.xml 229 BLAKE2B 1b25fb59c17f81a5c4b6dce7e07acb9de3bc64fef368805a0e1b45043dc13ab4898990b02b35d25ec3eb586aa67e236cc56519ed9a6bdb0d940f91b280e83141 SHA512 fcff4719a8e6c3cb446c48872c2278fa50ace7765d204b58d24f9ac0d47cb9fdaa7ed37080290ebc06d8dae864ccfdd8a48c9d9251a69862a6e5b58d5c26969b
diff --git a/dev-util/pycharm-community/metadata.xml b/dev-util/pycharm-community/metadata.xml
index de83cfd23616..abe40f18a4e9 100644
--- a/dev-util/pycharm-community/metadata.xml
+++ b/dev-util/pycharm-community/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>grozin@gentoo.org</email>
-	<name>Andrey Grozin</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="bundled-jdk">Use bundled jdk</flag>
 </use>
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 2b1645e7c28f..58a4229f3304 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,6 +1,4 @@
 AUX spirv-llvm-translator-16.0.0-ld_library_path.patch 2545 BLAKE2B b0a361f430bf7abd3e3cc24a71b7df5a8feda3bfef0b2832462b68c005356c6437c75f0257b66a3add54d3b1999275ff20cedfe9480c0ae63e78d32427c835f5 SHA512 73a134b774ee772f809b55f3369f6007b0fd19c9ddf566e81387fff5b4498c47dc5e3ada6367e2ccf3498346027543034d75977cb78d365d1c99405b9323b4e6
-AUX spirv-llvm-translator-17.0.0-do-not-rely-on-version-of-compiler-being-VER.0.0-219.patch 1163 BLAKE2B abd9247461c035790c6914c9719a44b30ef54a2d44246c58835af6349176341d1f1500d238163e4fe17406e6e36e701dfccf0d38729b85915c89f0618682e744 SHA512 374e7f701da543091e78027f0e4540e325c45c8b08d6ffeefc53337493aa76444e5b615c033ef198dd9422868ba0d8aec157a5f7b757510d05db02355d5bf15d
-AUX spirv-llvm-translator-17.0.0-intel-capability.patch 9322 BLAKE2B aa847ba0376fd78cd105b6dce4d785cb060f08a04da0ca52a12f689bbbb49b3eaec579669458e70c2b7f75b446752492e07cdc62c39e57e465532ce3f55b0cb4 SHA512 912ed2ffccb033c5bd7790e7d8e2f63437388375c17d8191a1fc4409daba9e2bd9e00ca3232ff4451f58fc430e040d7837f700f844c0a6fb14bfdccd61829a4a
 DIST spirv-llvm-translator-15.0.4.tar.gz 1598316 BLAKE2B f97a959b0dfb7c3ab6d24c72300b1ebbd70d98544c3f5e5b403aa412f5d599e9f846c6c9a4fce3c09a2a776cbb0349bb5b0112fe76fa1c6b0f7a12e139214dac SHA512 a19e3d20b632bcc623f6238e517b7a73ee99abdecc118fdda99972d22de2f74e7dbb880a726e2cd86ffd941fabaa8572f4130e409886691824eaa0e973d90a1b
 DIST spirv-llvm-translator-16.0.4.tar.gz 1589087 BLAKE2B 51cebc05fbc8ffc4d765b15a7dd5cc5b774002d4fed9e30acaf19e703f83bcecfaf7dbe7243dc5ed541e72613cf1800dd2f0f3b0f374b0619027f8171ac24b1b SHA512 02c3a4f443506a6a6015a1db7a57cf08242745d94cea27693929deb43bad6de18cf7152397454d295224818506b843fa7e537649d500e8f4b04fef9ec2333a4b
 DIST spirv-llvm-translator-17.0.4.tar.gz 1631063 BLAKE2B c55c5160355b797d52f8368c2d780dc89b6f92108bf22a8de7232327b4cd1c12531766bbe061b5c23926a4a8fa55394fba23e573346cfb8a12261b3c8aeec67c SHA512 454426b3146348c5128e1e6663068f34a2babca5a90864d6cff7fe3bf997ad64cf916759ebd294b3b4c20d89b1f0914e2943554761968425f92ebb48f85d0d28
diff --git a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-17.0.0-do-not-rely-on-version-of-compiler-being-VER.0.0-219.patch b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-17.0.0-do-not-rely-on-version-of-compiler-being-VER.0.0-219.patch
deleted file mode 100644
index e2a575600c44..000000000000
--- a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-17.0.0-do-not-rely-on-version-of-compiler-being-VER.0.0-219.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 587443c9e9094f37ac4e185fb4f889913c6992a9 Mon Sep 17 00:00:00 2001
-From: Dmitry Sidorov <dmitry.sidorov@intel.com>
-Date: Thu, 26 Oct 2023 04:36:07 -0700
-Subject: [PATCH] do not rely on version of compiler being $VER.0.0 (#2194)
-
-Co-authored-by: Stanley Gambarin <stanley.gambarin@intel.com>
----
- test/DebugInfo/NonSemantic/DebugFunction.cl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/DebugInfo/NonSemantic/DebugFunction.cl b/test/DebugInfo/NonSemantic/DebugFunction.cl
-index 43294916..f84b303a 100644
---- a/test/DebugInfo/NonSemantic/DebugFunction.cl
-+++ b/test/DebugInfo/NonSemantic/DebugFunction.cl
-@@ -25,7 +25,7 @@ void kernel k() {
- // CHECK-SPIRV-DAG: String [[foo:[0-9]+]] "foo"
- // CHECK-SPIRV-DAG: String [[#EmptyStr:]] ""
- // CHECK-SPIRV-DAG: String [[k:[0-9]+]] "k"
--// CHECK-SPIRV-DAG: String [[#CV:]] "{{.*}}clang version [[#]].0.0
-+// CHECK-SPIRV-DAG: String [[#CV:]] "{{.*}}clang version [[#]].[[#]].[[#]]
- // CHECK-SPIRV: [[#CU:]] [[#]] DebugCompilationUnit
- // CHECK-SPIRV: [[#FuncFoo:]] [[#]] DebugFunction [[foo]] {{.*}} [[#CU]]
- // CHECK-SPIRV: [[#FuncK:]] [[#]] DebugFunction [[k]] {{.*}} [[#CU]]
--- 
-2.43.0
-
diff --git a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-17.0.0-intel-capability.patch b/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-17.0.0-intel-capability.patch
deleted file mode 100644
index d7839367a2a1..000000000000
--- a/dev-util/spirv-llvm-translator/files/spirv-llvm-translator-17.0.0-intel-capability.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-diff --git a/include/LLVMSPIRVExtensions.inc b/include/LLVMSPIRVExtensions.inc
-index eb98c7f..4e2eb0b 100644
---- a/include/LLVMSPIRVExtensions.inc
-+++ b/include/LLVMSPIRVExtensions.inc
-@@ -41,7 +41,7 @@ EXT(SPV_INTEL_variable_length_array)
- EXT(SPV_INTEL_fp_fast_math_mode)
- EXT(SPV_INTEL_fpga_cluster_attributes)
- EXT(SPV_INTEL_loop_fuse)
--EXT(SPV_INTEL_long_constant_composite)
-+EXT(SPV_INTEL_long_composites)
- EXT(SPV_INTEL_optnone)
- EXT(SPV_INTEL_fpga_dsp_control)
- EXT(SPV_INTEL_memory_access_aliasing)
-diff --git a/lib/SPIRV/SPIRVWriter.cpp b/lib/SPIRV/SPIRVWriter.cpp
-index 807aa0c..0946dbe 100644
---- a/lib/SPIRV/SPIRVWriter.cpp
-+++ b/lib/SPIRV/SPIRVWriter.cpp
-@@ -409,11 +409,10 @@ SPIRVType *LLVMToSPIRVBase::transType(Type *T) {
-     const size_t NumElements = ST->getNumElements();
-     size_t SPIRVStructNumElements = NumElements;
-     // In case number of elements is greater than maximum WordCount and
--    // SPV_INTEL_long_constant_composite is not enabled, the error will be
-+    // SPV_INTEL_long_composites is not enabled, the error will be
-     // emitted by validate functionality of SPIRVTypeStruct class.
-     if (NumElements > MaxNumElements &&
--        BM->isAllowedToUseExtension(
--            ExtensionID::SPV_INTEL_long_constant_composite)) {
-+        BM->isAllowedToUseExtension(ExtensionID::SPV_INTEL_long_composites)) {
-       SPIRVStructNumElements = MaxNumElements;
-     }
- 
-@@ -421,8 +420,7 @@ SPIRVType *LLVMToSPIRVBase::transType(Type *T) {
-     mapType(T, Struct);
- 
-     if (NumElements > MaxNumElements &&
--        BM->isAllowedToUseExtension(
--            ExtensionID::SPV_INTEL_long_constant_composite)) {
-+        BM->isAllowedToUseExtension(ExtensionID::SPV_INTEL_long_composites)) {
-       uint64_t NumOfContinuedInstructions = NumElements / MaxNumElements - 1;
-       for (uint64_t J = 0; J < NumOfContinuedInstructions; J++) {
-         auto *Continued = BM->addTypeStructContinuedINTEL(MaxNumElements);
-@@ -1832,8 +1830,7 @@ LLVMToSPIRVBase::transValueWithoutDecoration(Value *V, SPIRVBasicBlock *BB,
-       } else
-         BVarInit = I->second;
-     } else if (Init && !isa<UndefValue>(Init)) {
--      if (!BM->isAllowedToUseExtension(
--              ExtensionID::SPV_INTEL_long_constant_composite)) {
-+      if (!BM->isAllowedToUseExtension(ExtensionID::SPV_INTEL_long_composites)) {
-         if (auto ArrTy = dyn_cast_or_null<ArrayType>(Init->getType())) {
-           // First 3 words of OpConstantComposite encode: 1) word count &
-           // opcode, 2) Result Type and 3) Result Id. Max length of SPIRV
-diff --git a/lib/SPIRV/libSPIRV/SPIRVEntry.h b/lib/SPIRV/libSPIRV/SPIRVEntry.h
-index a3c9441..e188099 100644
---- a/lib/SPIRV/libSPIRV/SPIRVEntry.h
-+++ b/lib/SPIRV/libSPIRV/SPIRVEntry.h
-@@ -908,11 +908,11 @@ public:
-   }
- 
-   SPIRVCapVec getRequiredCapability() const override {
--    return getVec(CapabilityLongConstantCompositeINTEL);
-+    return getVec(CapabilityLongCompositesINTEL);
-   }
- 
-   std::optional<ExtensionID> getRequiredExtension() const override {
--    return ExtensionID::SPV_INTEL_long_constant_composite;
-+    return ExtensionID::SPV_INTEL_long_composites;
-   }
- 
-   SPIRVWord getNumElements() const { return Elements.size(); }
-diff --git a/lib/SPIRV/libSPIRV/SPIRVModule.cpp b/lib/SPIRV/libSPIRV/SPIRVModule.cpp
-index 5ac7275..d8d06f6 100644
---- a/lib/SPIRV/libSPIRV/SPIRVModule.cpp
-+++ b/lib/SPIRV/libSPIRV/SPIRVModule.cpp
-@@ -1175,10 +1175,10 @@ SPIRVValue *SPIRVModuleImpl::addCompositeConstant(
-   const int NumElements = Elements.size();
- 
-   // In case number of elements is greater than maximum WordCount and
--  // SPV_INTEL_long_constant_composite is not enabled, the error will be emitted
-+  // SPV_INTEL_long_composites is not enabled, the error will be emitted
-   // by validate functionality of SPIRVCompositeConstant class.
-   if (NumElements <= MaxNumElements ||
--      !isAllowedToUseExtension(ExtensionID::SPV_INTEL_long_constant_composite))
-+      !isAllowedToUseExtension(ExtensionID::SPV_INTEL_long_composites))
-     return addConstant(new SPIRVConstantComposite(this, Ty, getId(), Elements));
- 
-   auto Start = Elements.begin();
-@@ -1213,7 +1213,7 @@ SPIRVValue *SPIRVModuleImpl::addSpecConstantComposite(
-   // SPV_INTEL_long_constant_composite is not enabled, the error will be emitted
-   // by validate functionality of SPIRVSpecConstantComposite class.
-   if (NumElements <= MaxNumElements ||
--      !isAllowedToUseExtension(ExtensionID::SPV_INTEL_long_constant_composite))
-+      !isAllowedToUseExtension(ExtensionID::SPV_INTEL_long_composites))
-     return addConstant(
-         new SPIRVSpecConstantComposite(this, Ty, getId(), Elements));
- 
-diff --git a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
-index d450a43..a2a0ddb 100644
---- a/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
-+++ b/lib/SPIRV/libSPIRV/SPIRVNameMapEnum.h
-@@ -610,7 +610,7 @@ template <> inline void SPIRVMap<Capability, std::string>::init() {
-   add(CapabilityGroupNonUniformRotateKHR, "GroupNonUniformRotateKHR");
-   add(CapabilityAtomicFloat32AddEXT, "AtomicFloat32AddEXT");
-   add(CapabilityAtomicFloat64AddEXT, "AtomicFloat64AddEXT");
--  add(CapabilityLongConstantCompositeINTEL, "LongConstantCompositeINTEL");
-+  add(CapabilityLongCompositesINTEL, "LongCompositesINTEL");
-   add(CapabilityOptNoneINTEL, "OptNoneINTEL");
-   add(CapabilityAtomicFloat16AddEXT, "AtomicFloat16AddEXT");
-   add(CapabilityDebugInfoModuleINTEL, "DebugInfoModuleINTEL");
-diff --git a/test/SpecConstants/long-spec-const-composite.ll b/test/SpecConstants/long-spec-const-composite.ll
-index a45c895..e943296 100644
---- a/test/SpecConstants/long-spec-const-composite.ll
-+++ b/test/SpecConstants/long-spec-const-composite.ll
-@@ -1,5 +1,5 @@
- ; RUN: llvm-as %s -o %t.bc
--; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_constant_composite %t.bc -o %t.spv
-+; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_composites %t.bc -o %t.spv
- ; RUN: llvm-spirv %t.spv --to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
- ; RUN: llvm-spirv -r -emit-opaque-pointers %t.spv -o %t.rev.bc
- ; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
-@@ -11,8 +11,8 @@
- target datalayout = "e-i64:64-v16:16-v24:32-v32:32-v48:64-v96:128-v192:256-v256:256-v512:512-v1024:1024-n8:16:32:64"
- target triple = "spir64-unknown-unknown"
- 
--; CHECK-SPIRV: Capability LongConstantCompositeINTEL 
--; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"
-+; CHECK-SPIRV: Capability LongCompositesINTEL
-+; CHECK-SPIRV: Extension "SPV_INTEL_long_composites"
- ; CHECK-SPIRV-DAG: Decorate [[First:[0-9]+]] SpecId  0
- ; CHECK-SPIRV-DAG: Decorate [[Last:[0-9]+]] SpecId 65548
- ; CHECK-SPIRV: TypeInt [[TInt:[0-9]+]] 8
-diff --git a/test/long-constant-array.ll b/test/long-constant-array.ll
-index 415a723..cfef59d 100644
---- a/test/long-constant-array.ll
-+++ b/test/long-constant-array.ll
-@@ -1,16 +1,16 @@
- ; RUN: llvm-as %s -o %t.bc
- ; RUN: not llvm-spirv %t.bc -o %t.spv 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
- 
--; Check that everything is fine if SPV_INTEL_long_constant_composite is enabled
--; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_constant_composite %t.bc -o %t.spv
-+; Check that everything is fine if SPV_INTEL_long_composites is enabled
-+; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_composites %t.bc -o %t.spv
- ; RUN: llvm-spirv %t.spv --to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
- ; RUN: llvm-spirv -r -emit-opaque-pointers %t.spv -o %t.rev.bc
- ; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
- ; TODO: run validator once it supports the extension
- ; RUNx: spirv-val %t.spv
- 
--; CHECK-SPIRV: Capability LongConstantCompositeINTEL 
--; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"
-+; CHECK-SPIRV: Capability LongCompositesINTEL
-+; CHECK-SPIRV: Extension "SPV_INTEL_long_composites"
- ; CHECK-SPIRV: TypeInt [[TInt:[0-9]+]] 8
- ; CHECK-SPIRV: Constant {{[0-9]+}} [[ArrSize:[0-9]+]] 78000
- ; CHECK-SPIRV: TypeArray [[TArr:[0-9]+]] [[TInt]] [[ArrSize]]
-diff --git a/test/long-type-struct.ll b/test/long-type-struct.ll
-index 9b83f62..de6352a 100644
---- a/test/long-type-struct.ll
-+++ b/test/long-type-struct.ll
-@@ -1,8 +1,8 @@
- ; RUN: llvm-as %s -o %t.bc
--; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_constant_composite %t.bc -o %t.spv
-+; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_composites %t.bc -o %t.spv
- ; RUN: llvm-spirv %t.spv --to-text -o - | FileCheck %s --check-prefix=CHECK-SPIRV
- ; RUN: llvm-spirv -r -emit-opaque-pointers %t.spv -o %t.rev.bc
--; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_constant_composite -spirv-text %t.rev.bc -o %t2.spt
-+; RUN: llvm-spirv --spirv-ext=+SPV_INTEL_long_composites -spirv-text %t.rev.bc -o %t2.spt
- ; RUN: FileCheck --input-file=%t2.spt %s --check-prefix=CHECK-SPIRV
- ; RUN: llvm-dis < %t.rev.bc | FileCheck %s --check-prefix=CHECK-LLVM
- ; TODO: run validator once it supports the extension
-@@ -10,8 +10,8 @@
- 
- ; RUN: not llvm-spirv %t.bc -o %t.spv 2>&1 | FileCheck %s --check-prefix=CHECK-ERROR
- 
--; CHECK-SPIRV: Capability LongConstantCompositeINTEL 
--; CHECK-SPIRV: Extension "SPV_INTEL_long_constant_composite"
-+; CHECK-SPIRV: Capability LongCompositesINTEL
-+; CHECK-SPIRV: Extension "SPV_INTEL_long_composites"
- ; CHECK-SPIRV: TypeInt [[TInt:[0-9]+]] 8
- ; CHECK-SPIRV: TypePointer [[TIntPtr:[0-9]+]] 8 [[TInt]]
- ; CHECK-SPIRV: TypeArray [[TArr:[0-9]+]]