diff --git a/lib32-llvm18/alr.sh b/lib32-llvm18/alr.sh
index a014dfa..5a1f47e 100644
--- a/lib32-llvm18/alr.sh
+++ b/lib32-llvm18/alr.sh
@@ -1,6 +1,6 @@
 name='lib32-llvm18'
 version='18.1.8'
-release='4'
+release='5'
 desc='32-bit LLVM libraries for Mesa'
 desc_ru='32-битные библиотеки LLVM для Mesa'
 homepage='https://llvm.org/'
@@ -27,13 +27,13 @@ build_deps=(
 	'gcc-c++'
 	'python3'
 	'python3-devel'
-	'zlib-devel.i686'
-	'libzstd-devel.i686'
-	'libxml2-devel.i686'
-	'ncurses-devel.i686'
-	'libedit-devel.i686'
-	'libffi-devel.i686'
-	'glibc-devel.i686'
+	'zlib-devel(x86-32)'
+	'libzstd-devel(x86-32)'
+	'libxml2-devel(x86-32)'
+	'ncurses-devel(x86-32)'
+	'libedit-devel(x86-32)'
+	'libffi-devel(x86-32)'
+	'glibc-devel(x86-32)'
 )
 
 build_deps_redos=("${build_deps[@]}")
@@ -41,23 +41,12 @@ build_deps_redos=("${build_deps[@]}")
 # Provides 32-bit LLVM libraries
 provides=(
 	'lib32-llvm18'
-	'llvm18-libs.i686'
 	'llvm18-libs(x86-32)'
-	'llvm18-devel.i686'
 	'llvm18-devel(x86-32)'
-	'llvm-libs.i686'
-	'llvm-libs(x86-32)'
-	'llvm-static.i686'
-	'llvm-static(x86-32)'
 )
 
 conflicts=(
-	'llvm-libs.i686'
-	'llvm-libs(x86-32)'
-	'llvm-static.i686'
-	'llvm-static(x86-32)'
-	'llvm-devel.i686'
-	'llvm-devel(x86-32)'
+	'llvm18-libs(x86-32) < 18.1.8'
 )
 
 _pkgver="${version}"
@@ -128,6 +117,17 @@ package() {
 		rmdir "$pkgdir/usr/lib64"
 	fi
 
+	# Remove static libraries to avoid conflicts with system llvm-static.i686
+	echo "==> Removing static libraries (.a files)..."
+	find "$pkgdir/usr/lib" -name "*.a" -delete
+
+	# Remove conflicting shared libraries (keep only LLVM-*.so)
+	echo "==> Removing conflicting shared libraries..."
+	rm -f "$pkgdir/usr/lib/libLTO.so"*
+	rm -f "$pkgdir/usr/lib/libRemarks.so"*
+	rm -f "$pkgdir/usr/lib/LLVMgold.so"
+	rm -rf "$pkgdir/usr/lib/bfd-plugins"
+
 	# Keep only essential headers for Mesa compilation
 	# Remove conflicting includes
 	if [ -d "$pkgdir/usr/include" ]; then
diff --git a/lib32-mesa/alr.sh b/lib32-mesa/alr.sh
index 999b98a..20a1d9c 100644
--- a/lib32-mesa/alr.sh
+++ b/lib32-mesa/alr.sh
@@ -1,6 +1,6 @@
 name='lib32-mesa'
 version='25.2.6'
-release='2'
+release='4'
 epoch='1'
 desc='Open-source OpenGL and Vulkan drivers (32-bit) with AMD RDNA 4 support for gaming'
 desc_ru='OpenGL и Vulkan драйверы (32-бит) с открытым исходным кодом с поддержкой AMD RDNA 4 для игр'
@@ -10,23 +10,14 @@ maintainer_ru='Евгений Храмов <xpamych@yandex.ru>'
 architectures=('amd64')
 license=('MIT' 'BSD-3-Clause' 'SGI-B-2.0')
 provides=(
-	'mesa-dri-drivers.i686'
 	'mesa-dri-drivers(x86-32)'
-	'mesa-vulkan-drivers.i686'
 	'mesa-vulkan-drivers(x86-32)'
-	'mesa-va-drivers.i686'
 	'mesa-va-drivers(x86-32)'
-	'mesa-vdpau-drivers.i686'
 	'mesa-vdpau-drivers(x86-32)'
-	'mesa-libgbm.i686'
 	'mesa-libgbm(x86-32)'
-	'mesa-libEGL.i686'
 	'mesa-libEGL(x86-32)'
-	'mesa-libGL.i686'
 	'mesa-libGL(x86-32)'
-	'mesa-libGLES.i686'
 	'mesa-libGLES(x86-32)'
-	'libglvnd-gles.i686'
 	'libglvnd-gles(x86-32)'
 	'lib32-mesa'
 	'lib32-mesa-dri-drivers'
@@ -45,23 +36,14 @@ provides=(
 	'libGLESv2.so.2'
 )
 conflicts=(
-	'mesa-dri-drivers.i686'
 	'mesa-dri-drivers(x86-32)'
-	'mesa-vulkan-drivers.i686'
 	'mesa-vulkan-drivers(x86-32)'
-	'mesa-va-drivers.i686'
 	'mesa-va-drivers(x86-32)'
-	'mesa-vdpau-drivers.i686'
 	'mesa-vdpau-drivers(x86-32)'
-	'mesa-libgbm.i686'
 	'mesa-libgbm(x86-32)'
-	'mesa-libEGL.i686'
 	'mesa-libEGL(x86-32)'
-	'mesa-libGL.i686'
 	'mesa-libGL(x86-32)'
-	'mesa-libGLES.i686'
 	'mesa-libGLES(x86-32)'
-	'libglvnd-gles.i686'
 	'libglvnd-gles(x86-32)'
 	'lib32-mesa'
 	'lib32-mesa-dri-drivers'
@@ -76,21 +58,20 @@ conflicts=(
 
 # 32-битные зависимости
 deps=(
-	'expat.i686'
-	'libdrm.i686'
-	'libelf.i686'
-	'libglvnd.i686'
-	'libx11.i686'
-	'libxcb.i686'
-	'libxext.i686'
-	'libxshmfence.i686'
-	'libxxf86vm.i686'
-	'libwayland-client.i686'
-	'libwayland-server.i686'
-	'zlib.i686'
-	'libzstd.i686'
-	'vulkan-icd-loader.i686'
-	'mesa'
+	'expat(x86-32)'
+	'libdrm(x86-32)'
+	'libelf(x86-32)'
+	'libglvnd(x86-32)'
+	'libx11(x86-32)'
+	'libxcb(x86-32)'
+	'libxext(x86-32)'
+	'libxshmfence(x86-32)'
+	'libxxf86vm(x86-32)'
+	'libwayland-client(x86-32)'
+	'libwayland-server(x86-32)'
+	'zlib(x86-32)'
+	'libzstd(x86-32)'
+	'vulkan-icd-loader(x86-32)'
 )
 
 # Зависимости для RedOS (32-бит)
@@ -111,7 +92,6 @@ deps_redos=(
 	'vulkan-loader(x86-32)'
 	'lib32-llvm18'
 	'lib32-lm_sensors'
-	'mesa'
 )
 
 # Зависимости для сборки (в основном 64-бит tools + 32-бит libs)
@@ -135,31 +115,31 @@ build_deps=(
 	'cbindgen'
 	'glslang-devel'
 	'spirv-tools-devel'
-	'glibc-devel.i686'
+	'glibc-devel(x86-32)'
 	'lib32-libdrm'
-	'libxcb-devel.i686'
-	'libX11-devel.i686'
-	'libXext-devel.i686'
-	'libXxf86vm-devel.i686'
-	'libXfixes-devel.i686'
-	'libXdamage-devel.i686'
-	'libxshmfence-devel.i686'
-	'libXrandr-devel.i686'
-	'elfutils-libelf-devel.i686'
-	'libglvnd-devel.i686'
-	'wayland-devel.i686'
+	'libxcb-devel(x86-32)'
+	'libX11-devel(x86-32)'
+	'libXext-devel(x86-32)'
+	'libXxf86vm-devel(x86-32)'
+	'libXfixes-devel(x86-32)'
+	'libXdamage-devel(x86-32)'
+	'libxshmfence-devel(x86-32)'
+	'libXrandr-devel(x86-32)'
+	'elfutils-libelf-devel(x86-32)'
+	'libglvnd-devel(x86-32)'
+	'wayland-devel(x86-32)'
 	'wayland-protocols-devel'
-	'libva-devel.i686'
-	'libvdpau-devel.i686'
-	'expat-devel.i686'
-	'libxml2-devel.i686'
-	'libzstd-devel.i686'
+	'libva-devel(x86-32)'
+	'libvdpau-devel(x86-32)'
+	'expat-devel(x86-32)'
+	'libxml2-devel(x86-32)'
+	'libzstd-devel(x86-32)'
 	'lm_sensors-devel'
 	'lib32-lm_sensors'
-	'systemd-devel.i686'
-	'libpng-devel.i686'
+	'systemd-devel(x86-32)'
+	'libpng-devel(x86-32)'
 	'vulkan-headers'
-	'vulkan-loader-devel.i686'
+	'vulkan-loader-devel(x86-32)'
 	'lib32-llvm18'
 )