gentoo auto-resync : 03:04:2024 - 08:13:58

15 files changed, 326 insertions, 15 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 61c7314e75a9..054cf903778e 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/lastfmlib/Manifest b/media-libs/lastfmlib/Manifest
index 23ab9532f5fb..78113bf9abb0 100644
--- a/media-libs/lastfmlib/Manifest
+++ b/media-libs/lastfmlib/Manifest
@@ -1,4 +1,7 @@
+AUX lastfmlib-0.4.0-autotools-tests.patch 1067 BLAKE2B 26f4b9a2c9bbb9e7c9a4d82edf270885d2d3508350cd7bd9aa73eb948f4bcc85d94e027ec71b46fa1f81e920ab066ba8313acd41abf89b1bec80748bcadae600 SHA512 f542744da540e89c5189c07bbd7b1711ad8905d9fa760c0437588935600ab70ac35da81805358f5f709ea666363010876b83ffcf7b14c5799f5b6a319e5adac7
+AUX lastfmlib-0.4.0-out-of-bounds-trim.patch 749 BLAKE2B 600aac6c952a568481d6a06abdc8f65f1e9d9e1c0018a88478d9ad4d867a41286365c169b6777bcfb0d906caad89f1b76c528957cbbd2e4b3a3569d7bded8205 SHA512 1de3951811bf0bd2862875232cbd5c457f5e3702c5cff8dccd76f029f528f91bc6846a0eee205463933fc0ffffa98158e546a34ba4bd37967295d1df7c0c533a
 AUX lastfmlib-0.4.0-string-conv.patch 510 BLAKE2B 088c8deb83ad96450b21e1d7a8e99d34a5421ccaa72ad75e102f89f011d494ee4e54c9799a1a6296543f7d230dcb41dec48a083d4c0a09a8a52f87744c7256ab SHA512 cd212e173559822586c97fe175791b7ca2ca7239cc511d5b4d07ff7dfc9ec87b5f3a126acf58c4bd95a7cb19cfc04b067ecb99fab6cb1815e59f56fe9c70ee4f
 DIST lastfmlib-0.4.0.tar.gz 333224 BLAKE2B 2e38adb90a468eccf959950d89e2e0b903e7e96c871b4d20216ee233933392fda7cd3bd86d90472e0f305922dc11e1dc998206c669a13be76eab7fdd07e6b45b SHA512 88e26bab04eda06f77f4684a5fe14aa9761acfcb5d7d8726c4d3ae5e1a4acd73e6b0c9bedff5d51bce07afd7b883085f1adba98714e8ebfc5bbd20b8aca66748
 EBUILD lastfmlib-0.4.0-r1.ebuild 710 BLAKE2B c234e5d75dc5511b741bc18d58bd5247ac47305bd02897983cac8620db176bbfe237f9035fd308e965c1232718083d9aade0e90493121c9f6358d865863c0e6b SHA512 d02034422add0eb6203083d54c1d9a2868d535e575e323562dcfd57d2eb552fe5cd4e7ba93a3e78939e80c385037465c859beb669a5c4259490903fcdc46d9b4
+EBUILD lastfmlib-0.4.0-r2.ebuild 993 BLAKE2B 1f7c70de6b94f0cc8c54ef2841081fcadcc1f99b47f2efa6f4da2473693fdfd1c7d3bff96a7dae7aa3550a57f23c9fb3b5294ec3888e7a392a116e50b663df5b SHA512 bbb02635fe0c5838c8c24396f857903198bd9533e7a9d2dc13b4461a6f116f0087aa4e472e76f9c925b0aa3bb5165151570b03531aa97e883d17a7b743e5b393
 MISC metadata.xml 336 BLAKE2B fd794c8e082ec8d25b4c103741b4c016b9e3dba543b1353cee0ca079258dfaff1957c6ed7a9a71e8c86552f46f8b6e5239ad61fffc0a4aa1880ebf3d26db44f5 SHA512 0c6b3d19043fa1b36dc0d9b00391bd8e271cbee6f2f98dfbe06f985bddcf7db2214c332d0a53045dde9b29024cc99ec34cf7272ee3b4591221c5884a743c67db
diff --git a/media-libs/lastfmlib/files/lastfmlib-0.4.0-autotools-tests.patch b/media-libs/lastfmlib/files/lastfmlib-0.4.0-autotools-tests.patch
new file mode 100644
index 000000000000..506d5a37693b
--- /dev/null
+++ b/media-libs/lastfmlib/files/lastfmlib-0.4.0-autotools-tests.patch
@@ -0,0 +1,31 @@
+* Run the tests as part of 'make check' (not just building testrunner).
+* Use pkg-config to find gtest, not the now-removed gtest-config.
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -59,6 +59,7 @@ pkgconfig_DATA = liblastfmlib.pc
+ 
+ if ENABLE_UNITTEST
+ check_PROGRAMS = testrunner
++TESTS = $(check_PROGRAMS)
+ endif
+ 
+ testrunner_SOURCES =    lastfmlib/unittest/testrunner.cpp \
+--- a/configure.ac
++++ b/configure.ac
+@@ -51,13 +51,10 @@ AC_ARG_ENABLE(unittests,
+    [  --enable-unittests Enables build of unittests ],
+    ENABLE_UNITTEST=$enableval)
+ 
+-if test "$ENABLE_UNITTEST" = "yes"; then
+-    AC_CHECK_HEADERS(
+-    [gtest/gtest.h],,
+-    [AC_MSG_ERROR([Missing gtest library, install the google unittest framework])])
+-    UNITTEST_LIBS="$(gtest-config --libs)"
++AS_IF([test "$ENABLE_UNITTEST" = "yes"], [
++    PKG_CHECK_MODULES([UNITTEST], [gtest], [], [AC_MSG_ERROR([Missing gtest library, install the google unittest framework])])
+     AC_SUBST(UNITTEST_LIBS)
+-fi
++])
+ AM_CONDITIONAL(ENABLE_UNITTEST, test "$enable_unittests" = "yes")
+ 
+ AC_SUBST([pkgconfigdir])
diff --git a/media-libs/lastfmlib/files/lastfmlib-0.4.0-out-of-bounds-trim.patch b/media-libs/lastfmlib/files/lastfmlib-0.4.0-out-of-bounds-trim.patch
new file mode 100644
index 000000000000..6c01a59269d4
--- /dev/null
+++ b/media-libs/lastfmlib/files/lastfmlib-0.4.0-out-of-bounds-trim.patch
@@ -0,0 +1,24 @@
+Fix out of bounds assertion with -D_GLIBCXX_ASSERTIONS on empty string in testsuite.
+--- a/lastfmlib/utils/stringoperations.cpp
++++ b/lastfmlib/utils/stringoperations.cpp
+@@ -40,7 +40,7 @@ void trim(std::string& aString)
+ {
+     size_t begin    = 0;
+     size_t end      = aString.size() - 1;
+-    
++
+     while ( aString[begin] == ' '  || aString[begin] == '\t'
+          || aString[begin] == '\r' || aString[begin] == '\n')
+     {
+@@ -50,8 +50,10 @@ void trim(std::string& aString)
+             break;
+     }
+ 
+-    if (begin == aString.size())
++    if (begin == aString.size()) {
+         aString = "";
++        return;
++    }
+ 
+     while ( aString[end] == ' '  || aString[end] == '\t'
+          || aString[end] == '\r' || aString[end] == '\n')
diff --git a/media-libs/lastfmlib/lastfmlib-0.4.0-r2.ebuild b/media-libs/lastfmlib/lastfmlib-0.4.0-r2.ebuild
new file mode 100644
index 000000000000..590503f295ec
--- /dev/null
+++ b/media-libs/lastfmlib/lastfmlib-0.4.0-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="C++ library to scrobble tracks on Last.fm"
+HOMEPAGE="https://github.com/dirkvdb/lastfmlib/releases"
+SRC_URI="https://github.com/dirkvdb/lastfmlib/archive/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug syslog test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="net-misc/curl"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-string-conv.patch"
+	"${FILESDIR}/${PN}-0.4.0-autotools-tests.patch"
+	"${FILESDIR}/${PN}-0.4.0-out-of-bounds-trim.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	CONFIG_SHELL="${BROOT}"/bin/bash econf \
+		$(use_enable debug) \
+		$(use_enable syslog logging) \
+		$(use_enable test unittests)
+}
+
+src_test() {
+	emake check VERBOSE=1
+}
+
+src_install() {
+	default
+	find "${D}"/usr -name '*.la' -delete || die "Pruning failed"
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 9aaf28272c29..19a51940961c 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -10,6 +10,6 @@ EBUILD mesa-23.3.6.ebuild 12326 BLAKE2B bfceb07d3150be0bcb518a3c999314abdca9472e
 EBUILD mesa-24.0.1.ebuild 11544 BLAKE2B 51e4ae658d2e70eb60145a79d274e9482b8d584b996bda549c39c015dfbe1502e16694845b8419a4df263e719e64e90e8c6dbb436a24c721283c04b74f63940a SHA512 f54095f1331f8315f7230565f7a954f7fea7e246c821a30ef466750678698eeefda857eed4a5a1747b2a1eb26f50c5dd485399edd8128d74558cb7409dcbc769
 EBUILD mesa-24.0.2.ebuild 11538 BLAKE2B 105189b124b44ece9da9e4df2f808e301f44a0caf39a65d79eb874ccc1defae0745bdadab6b5e985a86a5e8f3972f9c9025552eaa0a166a60dd8d83c16542fb8 SHA512 79b4e98d78daaf0b4e210eaff14e64dcc0379893ac7f68d56a26da59a29de8092c6c4235cc8994524f0c58365932c84f55aac536c7825fbad4e84909263375cc
 EBUILD mesa-24.0.3.ebuild 11538 BLAKE2B 5c3662d09d2355060e4ffd1e8c5ac3de90c901024a2123c8213a86f2c8190301067057945d603f5c8db48389ab89f014caef7ea64e045caca4e08322ff6f04f3 SHA512 a883e4607b7045e3b46080f38494ce4ff998ffa2eb71635c83e064d2b050e4e289dce774c2d4f5a4e553d61950948c1f60689d9f1e27aef1104daffd7e4b217b
-EBUILD mesa-24.0.4.ebuild 11624 BLAKE2B b288d110a1cf24d398d023b35951e4bae2247568adacd3b57c24ce1867b11aa5f533bdcab529f1e8648ab4c191a86be922610b805882baa5d63f64e653e51be9 SHA512 c1fe8f11e1e23f149dad901e346f35199f77460efe5463275ec51e358e8d9772db2fa0bec8107ce68920b88f4b96f239e5df39fbd69b6b1977463c0b10d5bff9
+EBUILD mesa-24.0.4.ebuild 11622 BLAKE2B 21b8abb688e9ebb187ecc7a961ce851a83c5b09c58d3a51a3dd1151e927322c85a8ab44c5f6108dd4d02ca665eccdb2ade4d1604abe78c48eaee747b82c37329 SHA512 9eea957f1ec9db156c8fd9210214b566991524d3422fb411ec3758088b9851f8499e28c7284911f153ab64e1ec25088bf9b6485e2a7b406950edea9a0557c43a
 EBUILD mesa-9999.ebuild 11442 BLAKE2B 49af919870c99badd70793ea84038e02eb5bd92bc41c3bddccfc2404e7450d0217c8144ebdd37c9a8e80895b6880a2837630b4afbe2250c560f4d3143320f7a3 SHA512 9a82ae1d9f846601c8d7344174a4a8d462f5adcbb7424d9ded565b6e10b2cfb31e75eb297f321cd332022abc5df9e6fe59c5e42768f49aa004b826c8477e9fa7
 MISC metadata.xml 1435 BLAKE2B 53690878512b86ce0b8dce38b083684c85ad5c1a655d5a69cb3265e156869845263eb16f271691b66c9f0cd76e97b56908acf7a1792d6abac0ec99447826cbb5 SHA512 842106e5d6eb60ff33c8cae7f0d52983c4f7e104152718b50fc790cbcb2506551a6fc7841fe8e3c7963850c238f77505b0e49b10a3a936baf459e1acaf73e07f
diff --git a/media-libs/mesa/mesa-24.0.4.ebuild b/media-libs/mesa/mesa-24.0.4.ebuild
index a474e56c13dc..b403898f164c 100644
--- a/media-libs/mesa/mesa-24.0.4.ebuild
+++ b/media-libs/mesa/mesa-24.0.4.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 fi
 S="${WORKDIR}/${MY_P}"
 EGIT_CHECKOUT_DIR=${S}
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index d8c28ce59e76..c256053fed28 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,4 +1,6 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
 DIST shaderc-2023.8.tar.gz 227238 BLAKE2B 334bda3bdff510ac97f97fa710e18ca9a2c807d1e71973aaf4493112dca3adb69c7a83c0590c65db3e6dffab82f500058162d3190e5822a01ea2d611db771857 SHA512 2a5e59a2bb6c4b5462758d824747fee0edaf177dc64f30fe698fd2d2cc21cddab1a19ec2b2d63bd3d2e209330a13519f399395398379370b15daa39e6ee6b2bf
+DIST shaderc-2024.0.tar.gz 227125 BLAKE2B f11f2acad796f41015d4738b964526f119e944b1cfa2103ab3452adcf5790a04adbd10f9d55423b3ce567e87f64eb241067c786c4a7b76bb884aa70c100d0eb8 SHA512 ca80b22a80bf1a222e6deecbe63f99c6eed980c6c31b4f7981b6c8dc5637b7271c861543566e01aaf945df40da095b63a69f2e22f061a41faad2ecca5dc187ae
 EBUILD shaderc-2023.8.ebuild 1903 BLAKE2B dd37e5098ccdcfb8d7335e4e44cfc810a651891694dadcb4f42cd236643512d8b895def9bd2d2ce2072317830213d05bf67986ca3bd76feb8c21b518a89137e3 SHA512 0775b542b9dabdf8ffbf7e5136234c7f5cde58b4a2d8a4412ed13ef3cb8635d61e46e3da5fa5b75210e81195825aa3faee29881883e774ce89689eda62c0d13b
+EBUILD shaderc-2024.0.ebuild 1902 BLAKE2B 53e48d9847403ee87b4af2b1f98c4e0e8d8e53589788ad892d18aeb3d40a439697ba6066645ec1f575095fa9e965882875b2c08bc9d99a0e56445047b61ec5c6 SHA512 2330e529b12745110ce0ea42355336eda5209cc4e8b22d94137d16dca5a254c8fe3ace821fe97f29467c44f067c8808c8b87079f52d4806711d41738e9398894
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2024.0.ebuild b/media-libs/shaderc/shaderc-2024.0.ebuild
new file mode 100644
index 000000000000..bd38b2831f82
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2024.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake-multilib python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc"
+EGIT_COMMIT="${PV}"
+SRC_URI="https://github.com/google/${PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	~dev-util/glslang-1.3.280.0:=[${MULTILIB_USEDEP}]
+	~dev-util/spirv-tools-1.3.280.0[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	~dev-util/spirv-headers-1.3.280.0"
+
+BDEPEND="doc? ( dev-ruby/asciidoctor )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020.4-fix-build.patch
+)
+
+# https://github.com/google/shaderc/issues/470
+RESTRICT=test
+
+src_prepare() {
+	cmake_comment_add_subdirectory examples
+
+	# Unbundle glslang, spirv-headers, spirv-tools
+	cmake_comment_add_subdirectory third_party
+	sed -i \
+		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
+		glslc/test/CMakeLists.txt || die
+
+	# Disable git versioning
+	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
+
+	# Manually create build-version.inc as we disabled git versioning
+	cat <<- EOF > glslc/src/build-version.inc || die
+		"${P}\n"
+		"$(best_version dev-util/spirv-tools)\n"
+		"$(best_version dev-util/glslang)\n"
+	EOF
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSHADERC_SKIP_TESTS="true"
+		-DSHADERC_ENABLE_WERROR_COMPILE="false"
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi && use doc; then
+		cmake_src_compile glslc_doc_README
+	fi
+	cmake_src_compile
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
+	fi
+	cmake_src_install
+}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 4501ef4116e6..4fb2b36d5160 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,5 +1,7 @@
 AUX vulkan-layers-1.3.250-Build-shared-libs.patch 333 BLAKE2B 557bfc8dc1639f31b873ec950dc9d99f4632d953b7c3d104d0b69b68985a0d214a4d5eb42a64d28aeed41a889515305f47f8a1b3646501d36f99d67c79f24789 SHA512 ddd30ac012cfa0e1ea7cbc84c11d4398272c9f2314bb8f0d3a3758f89162239feaff0e1044284a730a8288754dd1b6cab99b98e28199457a81137a7a22601413
 DIST vulkan-layers-1.3.275.tar.gz 5280585 BLAKE2B a9707dc18c4802b1f6fd851ec7b16201035c1809c7e42fcd2d3f08dd7de162a18ee240f9269e233a67c93b49bd69f3babda73265bb9ac343e2924b19fa6288dd SHA512 755bdde7e7129b7a3ed06a4bebdaf11212288802119e0dc224aab63491de30c9b1c25972bdafd4fedbfea43bf6c29cdbc409374e57fbf0331798530a8ae94a70
+DIST vulkan-layers-1.3.280.0.tar.gz 5465068 BLAKE2B c0b568b59cb8a17bea7dd1c1522c0a72279ad6a07f2f11383bc069f141fbb179529dd4ccd34b2a7a9a9a4af0e173ebbc49541a42c2b32ea8b54d90302f7ee449 SHA512 b397d4aa5406e25eb241a72f006fb05554d8ec96eec4c31ed08ef34d0b362f8e544a2e8bcf044112bdbb2733f2a9f50bf8b63aff64e143e450fa01298dc7838a
 EBUILD vulkan-layers-1.3.275.ebuild 1644 BLAKE2B 5d03caef5de18f10040bbe5fcfa23526c51684ef95fd9953efdfaa1b217cf11d5e6561ffeb14390c62ab32ea6bd38fcd002120b3a4b0fed80d386ffde9d9f08b SHA512 bd2e9eced89d8161eca83c07d27342abb68e147d60094285437c83aeb9089ff30eef038ff8d70679f24a71eb18f772532df5d91b1223306a02107e9c75dee537
-EBUILD vulkan-layers-9999.ebuild 1642 BLAKE2B 4f3b7567bb5a183f3d3a1929531349a67c732c2dfe9fe2375c4516513f1af16675a622c566b8f47df1a3cc4b575601e1a25acf87c790c2a971d1adfdb5b69bf5 SHA512 7ca20decc9501fc86cddb8b14bab9ec1945d7e2f2a3c6634f02c35b95823be376a875da1941b354d5c76901e29b97b5a470657aea92c9fe0eab875f311ab789e
+EBUILD vulkan-layers-1.3.280.0.ebuild 1646 BLAKE2B 624c9d714e188a4865ac48e7ef1408bfd60e9d079d2036f3ae782daa6f0209218bb341d479873f481d4a270c26042b1c68152a2eafacfb8bc7a69a611ba4c8ac SHA512 0c80de23d7d1d5fbd9636f4d860c845d8874fac759edf3875a0a1022866759a8ec8362b1b20408fd5b1b5363cd67e820d311b0459f347c6cdfbfaf6392aaf4a1
+EBUILD vulkan-layers-9999.ebuild 1646 BLAKE2B 624c9d714e188a4865ac48e7ef1408bfd60e9d079d2036f3ae782daa6f0209218bb341d479873f481d4a270c26042b1c68152a2eafacfb8bc7a69a611ba4c8ac SHA512 0c80de23d7d1d5fbd9636f4d860c845d8874fac759edf3875a0a1022866759a8ec8362b1b20408fd5b1b5363cd67e820d311b0459f347c6cdfbfaf6392aaf4a1
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.280.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.280.0.ebuild
new file mode 100644
index 000000000000..8e97234b84e0
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.280.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-ValidationLayers
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-cpp/robin-hood-hashing-3.11.5
+	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
+	~dev-util/spirv-headers-${PV}
+	~dev-util/vulkan-headers-${PV}
+	~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+QA_SONAME="/usr/lib[^/]*/libVkLayer_khronos_validation.so"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name \*.a -delete || die
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index b1f4f7dd83eb..8e97234b84e0 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 MY_PN=Vulkan-ValidationLayers
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
@@ -12,9 +12,9 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi
 
 DESCRIPTION="Vulkan Validation Layers"
@@ -24,12 +24,12 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="wayland X"
 
-RDEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-cpp/robin-hood-hashing-3.11.5
 	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/spirv-headers-99999999
+	~dev-util/spirv-headers-${PV}
 	~dev-util/vulkan-headers-${PV}
 	~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES="${FILESDIR}/${PN}-1.3.250-Build-shared-libs.patch"
+QA_SONAME="/usr/lib[^/]*/libVkLayer_khronos_validation.so"
 
 multilib_src_configure() {
 	local mycmakeargs=(
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 3257220d4f01..8776299ba670 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-loader-1.3.275.tar.gz 1701415 BLAKE2B c92cc2d3ff3c90eaaa820f0f857030ab6f957d0691f7cbaf53985bd4d4c6f0f2b4222623740bd2c433c2e0116545af37b8ac9959b554b800ca95a978fd1b14b5 SHA512 7af0110083ab827e4ea8b4ea3e3ce00d9387f27f5725cefd426fa4dee4b80bc83210248c2968577a90bb82de8efb1a68691a1bdb93769f2f04600c5a3d3eff91
+DIST vulkan-loader-1.3.280.0.tar.gz 1702731 BLAKE2B 65b4af33af1f8bbf50fdf95bee1018195961c8d553494981459d9cc4b158ec9d78316ce0d91b8eba1c0679d73ce685adaabebcd2ece1aaf47440e40f8848b083 SHA512 8ec98e0da867f829e048e100a97d7b94a3c40f56f858e3eb81f11f6f58e20e59da6ca8785a9642958ff3b698c618b9968407028cc66dfa0ad296576bf9db45ca
 EBUILD vulkan-loader-1.3.275.ebuild 1546 BLAKE2B 7d3b40829acc8939a7d592fe6db0d9cda8419aa342879c4ee99de6c8c65518e1b95bc58776f259dec45403c418c7d2662b58865832a9b683bfe686d8b427f911 SHA512 5a49910f2e06cc373dc101fbfbff0415a8c65d20ec46f21e4fdd19735b08138cedc7aba7594e88cca591b512d1ecab23a64acea2b4e37c6efc94da98944bbc69
-EBUILD vulkan-loader-9999.ebuild 1562 BLAKE2B 19ca31786af5a26cc88d508374efebd1bb3f2bd7929ad0236b4a1bd70fbd5c54e44b149e8de23bb51ec8448a7bdc8573dca7adc4de45517b157f98b87ddfac2f SHA512 89f8b81fa6b47fa6a94abd3fa15e9b52b184de225b2e0a5df4cf833f9db804b7dd087c73fa12167ffc4d06414cdd50487f4ea462f78127810f0d23eadd3e8d1b
+EBUILD vulkan-loader-1.3.280.0.ebuild 1552 BLAKE2B 2f42ef99792fb97542b7695ae89d396c5c2f0e2a16bd05e29ed019fce1795953b5795b54e7f42a4caf3e60bffa74a2cdf4a2df11fddfeb49a81cfd9f1aab0300 SHA512 a6fe7d5f1697dd1abfef7ffe42d53f208f9d4a956942fb3f96ce4ad54ca6ed9c950fdfdd205a16043bff91d77c29e2926cd70e61865d54baa8e150c98712fb7f
+EBUILD vulkan-loader-9999.ebuild 1552 BLAKE2B 2f42ef99792fb97542b7695ae89d396c5c2f0e2a16bd05e29ed019fce1795953b5795b54e7f42a4caf3e60bffa74a2cdf4a2df11fddfeb49a81cfd9f1aab0300 SHA512 a6fe7d5f1697dd1abfef7ffe42d53f208f9d4a956942fb3f96ce4ad54ca6ed9c950fdfdd205a16043bff91d77c29e2926cd70e61865d54baa8e150c98712fb7f
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.280.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.280.0.ebuild
new file mode 100644
index 000000000000..ca20e66ef4a1
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.280.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Loader
+inherit flag-o-matic cmake-multilib toolchain-funcs
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+DEPEND="
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTS=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake_src_install
+}
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 7d311b4ae225..ca20e66ef4a1 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.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
@@ -11,9 +11,9 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi
 
 DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
@@ -44,7 +44,6 @@ multilib_src_configure() {
 		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
 		-DCMAKE_SKIP_RPATH=ON
 		-DBUILD_TESTS=OFF
-		-DBUILD_LOADER=ON
 		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)