7 files changed, 44 insertions, 8 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 7f3059b4ff5e..781934deab09 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/realesrgan-ncnn-vulkan/Manifest b/media-gfx/realesrgan-ncnn-vulkan/Manifest
index 14fe253a29ba..b13fd6d073f9 100644
--- a/media-gfx/realesrgan-ncnn-vulkan/Manifest
+++ b/media-gfx/realesrgan-ncnn-vulkan/Manifest
@@ -1,5 +1,6 @@
+AUX realesrgan-ncnn-vulkan-0.2.0-no-glslang-libs.patch 496 BLAKE2B 4da4d6b6f19fdc86a086866f2982dc5e6ee0f440560c7a765e924073b7bac8a6d9dcb87a892397404b29b9dc1108cabf965f950f06665d72a0b12e57076f8a47 SHA512 ab94ab82ebf7539eaea96a2992761537ae896f46677de4538d06e4dda95f2fe82413983c09c8194fd7a460dc863c00a6c31b567daf32f670ab1f21f04e86db93
 AUX realesrgan-ncnn-vulkan-default-realesrgan-x4plus-model.patch 1479 BLAKE2B 9d34821ed2af85ba048c9a9c9abae3c40b0568c723fec0db95b3a84f706a69ef2fddf31a3e613adb9d06481616b2f3681b304e77c205c4563a6ae315b6bac6bf SHA512 541dc5ae5c657caceb3e0a248428eeeb8fce58c52f8c43cfaeab47171a86532547ecbf6773faa2634be2934a659cdb913a0898f9d6a2db900baca292b073ca59
 DIST realesrgan-ncnn-vulkan-0.2.0.tar.gz 138744 BLAKE2B ec74388e789efbf6ea82a88428ff5745aa65d38b3d490b80858f91e21ff0f50333f791dadf2a626a4bee1ca88c808e41a413afce1f85d5a82aa824ecab673838 SHA512 5c845ad2fbea45eba1899582f3ca69bea679107cc4b3c49a94649b5a954117269a5b7d65ffeb8943531c71fff2ca749c06d0e3e0fd9c155ad3196f48c548d7cd
 DIST realesrgan-ncnn-vulkan-models.tar.xz 69216524 BLAKE2B ed9a1f019a48b81828221eb1cad38d0a710dfae15a13729276b040aed33bba0d326906fb0e9e162ce0ea4dc6f1bbcae92c08c4479fc3b09e854c2d5718b62c04 SHA512 4ac10f031688b18ac0920a0d848520a1fe4818a4141914ab4f4d36505abb271f4dbc538b41c3bc34586d7485773d86df2446c4af41f6d00cf4b140975ce21eda
-EBUILD realesrgan-ncnn-vulkan-0.2.0-r1.ebuild 1282 BLAKE2B 191ea0b7d1302a0fa6744c3843823c5ba824dfca69ac7db3fa8ca3792bbbba1e4f882f832c1340417c8f3002937a4bd4ce668f696478d3da9ef41fbc15f2d5ce SHA512 742d93ad0cb52d2c0e23439d0c31a15be49c20ca98cb1b82407d0e109c758abbea6352e9e91c9c91423c28ed702c16860cf89a63ed6502dbd70009be762c3934
+EBUILD realesrgan-ncnn-vulkan-0.2.0-r1.ebuild 1282 BLAKE2B ee3b5ec2523d8466f8ead1f353df3e9b76a0f4709e41f32ae027610aef515cf62f440944ae882b7e1d465245fa6f5b75a93484dcb337f536fb03efeae3256156 SHA512 1f48d1cfde45a89a4bcda051a588e06846c1fc6ce6bdf5c39c17c4234cf50330ac8c7f26eb4c780da8823c5a2346584f6cb6b2a0beedc0caaf0384380eeec014
 MISC metadata.xml 342 BLAKE2B 04b8955b1e0c980600685a6748eb4173cae733c9aeeb705c58119ede5d47b7552a81813baa21f6d49b8dc9453f4240dc77bf0a077810600d19b36b9a6f58c4f8 SHA512 9bc43c6ff21c64facfce322777ceac1422cc444e9bf3c97036ddc85d51b180c847803417a9c96d709cfff03b586ed92d1f55af04d495f1b692bedd39b925ce1c
diff --git a/media-gfx/realesrgan-ncnn-vulkan/files/realesrgan-ncnn-vulkan-0.2.0-no-glslang-libs.patch b/media-gfx/realesrgan-ncnn-vulkan/files/realesrgan-ncnn-vulkan-0.2.0-no-glslang-libs.patch
new file mode 100644
index 000000000000..ac8442f16518
--- /dev/null
+++ b/media-gfx/realesrgan-ncnn-vulkan/files/realesrgan-ncnn-vulkan-0.2.0-no-glslang-libs.patch
@@ -0,0 +1,15 @@
+With USE_SYSTEM_NCNN this seemingly(?) tries to check if glslang
+libraries exists only to know if system ncnn has support which is
+already ensured through DEPEND here.
+
+And then the checks fail[1] with modern glslang, so yank out the
+unnecessary block.
+
+[1] https://bugs.gentoo.org/922511
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -99,3 +99,3 @@
+ 
+-if(USE_SYSTEM_NCNN)
++if(0)
+     set(GLSLANG_TARGET_DIR "GLSLANG-NOTFOUND" CACHE PATH "Absolute path to glslangTargets.cmake directory")
diff --git a/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0-r1.ebuild b/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0-r1.ebuild
index 6a38c35e4cc2..3f7d27a8c5ac 100644
--- a/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0-r1.ebuild
+++ b/media-gfx/realesrgan-ncnn-vulkan/realesrgan-ncnn-vulkan-0.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,12 +25,15 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	dev-util/glslang
 	dev-util/vulkan-headers
 "
+BDEPEND="
+	dev-util/glslang
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-default-realesrgan-x4plus-model.patch
+	"${FILESDIR}"/${PN}-0.2.0-no-glslang-libs.patch
 )
 
 src_prepare() {
@@ -46,7 +49,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
 		-DUSE_SYSTEM_NCNN=ON
 		-DUSE_SYSTEM_WEBP=ON
 	)
diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest
index 89f55ac7f9fd..c2cf193ccaa9 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/Manifest
+++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest
@@ -1,4 +1,5 @@
 AUX waifu2x-ncnn-vulkan-20210521-no-lto.patch 600 BLAKE2B a4fa9601b48d103c15ed8e93658e633cb0d63f304a5d5ad9336f0b1cdc05e58001fa80cd4ab50cb688d50037560446dd051256617dae51578dabd110586f13ab SHA512 c6bc6b33b26c9d4dbe6728685c9ff68b2b7b8bd1afdeae1e0d3283bc292eb1ccc81d7ba0cd7baaccdf4b367876140ed939e84b0dfe63e1eb1c1100094265e333
+AUX waifu2x-ncnn-vulkan-20220728-no-glslang-libs.patch 496 BLAKE2B 09a43347fa97ef20eb7c8d1b4c1192e52d162ae3f24866e16fdd731d5205a79dde570c66620ae1f24af9928b1bf96f691de9b7da735a701f32b2bef4e36518c0 SHA512 6a4c6e14203233036df1bd961bfec88111285685f4ec936ac0e08e9a6f43b6cb8158ccee7afd94bb4b15d4a255e091bffc2090807d203c62bc8b3142ac9d62e2
 DIST waifu2x-ncnn-vulkan-20220728.tar.gz 34076924 BLAKE2B 6ed310d57af52286a288b151f67a989ac41f8e248b2ad5f05392781a429c9f0ff1d79e8816c8c464cb5686692c2b4fe5dc2d50c4fc713a4887d044ee3cfda199 SHA512 ea17cbbcb7318586793222c6c7139f67395c49c567b601969b829fc426eb517308509b7c1da69171fcbf8e68baa5cec3e52e98159e3c5e6c35ce47a8514dadb7
-EBUILD waifu2x-ncnn-vulkan-20220728.ebuild 1097 BLAKE2B eccda35ac9815d03c96177700816463a29e84d701e22217b55120a54c2f4515bbb078938a673cbdf2315ef838b8a0bf1ecf2899f90be5f4a2de0c14b7654dac6 SHA512 99da1941014e2627b8479d7b1f1a4488f178e530cd3aa6e436fb4fb0c0cbf152782252c97aa95f76adb62ed7d38fb14c23024d2fcc04286fa4e70a7fc58408dd
+EBUILD waifu2x-ncnn-vulkan-20220728.ebuild 1100 BLAKE2B f59150f1bf79eef42bf51df8f58c395f5a33e576ddc3521d3eb4342504a8611d0fe34f78792df19cd33eb93639b5945c448ce2f6e9d8b9edf133d37f98905576 SHA512 73fae763f283c9778516c9c4a89329cb0c8c6324d207557b4187094a9dcee9c8640086cd11d8aa5e310612d2b00a38de2281577a3c71258b1d83f094db563266
 MISC metadata.xml 336 BLAKE2B 9ec633b675b5bef317783ecb8249fb8621728f29ed7b3cb064292f4ef7ff4176b819975b7353f976eb9ead35bbef6a000dd91cd7fa81f9d4fa5942fc15de4dba SHA512 af5220b2144e3d08778dbee6389eaf2e2e743f76064afce713fa96ff1f596af6559d7aabad097beff1b059c5230ce0943a84f01ccfdb4c41949ff717e6bdf832
diff --git a/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20220728-no-glslang-libs.patch b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20220728-no-glslang-libs.patch
new file mode 100644
index 000000000000..7743c4267180
--- /dev/null
+++ b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20220728-no-glslang-libs.patch
@@ -0,0 +1,15 @@
+With USE_SYSTEM_NCNN this seemingly(?) tries to check if glslang
+libraries exists only to know if system ncnn has support which is
+already ensured through DEPEND here.
+
+And then the checks fail[1] with modern glslang, so yank out the
+unnecessary block.
+
+[1] https://bugs.gentoo.org/922512
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -55,3 +55,3 @@
+ 
+-if(USE_SYSTEM_NCNN)
++if(0)
+     set(GLSLANG_TARGET_DIR "GLSLANG-NOTFOUND" CACHE PATH "Absolute path to glslangTargets.cmake directory")
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild
index d67e89271687..333b2c58ac8d 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20220728.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,12 +20,15 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
-	dev-util/glslang
 	dev-util/vulkan-headers
 "
+BDEPEND="
+	dev-util/glslang
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-20210521-no-lto.patch
+	"${FILESDIR}"/${PN}-20220728-no-glslang-libs.patch
 )
 
 src_prepare() {
@@ -39,7 +42,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
 		-DUSE_SYSTEM_NCNN=ON
 		-DUSE_SYSTEM_WEBP=ON
 	)