gentoo auto-resync : 02:09:2022 - 10:16:01

11 files changed, 392 insertions, 2 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 6cb5da319386..0450244a4238 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 536a429887a7..f058e22f33aa 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -5,5 +5,5 @@ DIST gmp-api-Firefox39-e3935759360861812d33cbd3b713e25f1de1ecb5.tar.gz 10440 BLA
 DIST openh264-2.2.0.tar.gz 60275282 BLAKE2B 69e44396de229c65cf7a87d6f9ce8e2ef67fbdad6740f6aa64825b71fc00af945dca3e4726b9f0b4f4b83e363f3f7aadadabbab291c612b0fb61b42478a8cacf SHA512 637e2bfa45ad586c10fc8990cad4d824ada07e277fd965c3a6cdd19bc7836b2d7082574037a3ff2ee631207dd8cb0ec4f68abafdc19646b433de561c47ce8d38
 DIST openh264-2.3.0.tar.gz 60290792 BLAKE2B 08aa571471188c72bb0f098fa1cfaf9ba46ee4311f50518de868a2d7bbd61d9d4547cf5d33b3140d56c09a1ea7ea411bfaa96ed960e159876e6cc803f081b5d3 SHA512 5f0ccbb3c0026a010d9830e973312486f9d5ea8152afa3653ab6b3c43906a1169cebea70532134c1624846cc03b586e85b12cfd0621af505bd532a7dd833defd
 EBUILD openh264-2.2.0.ebuild 3615 BLAKE2B 4558f97d1cecd36a9417a0ee9205b3f39fa72c1716d0f0fa80e1f1150fd0a3c01f49da973f01878e9ffcf16756835fa825685ce6951d1e3d52330b96c63b4a37 SHA512 7b58faf74d181c2637ad9647fc0d53ee209839316b772b8f0e6ce96228419ad9fcf41fc9d01b1ba0fa59e595683d843ad3766dc9995bdc7fd11aec97f9c9d914
-EBUILD openh264-2.3.0.ebuild 3625 BLAKE2B 013276c1c0d079587e57cb1b2cfaa9734508edf4bd332d70d70d652a66dfa008af7669c1c9034e53dc1eeba6a72e0acacb8c47a19ba33ceef76494f15f037182 SHA512 c36ebf8476265e62fec0460cbf418379c4d12167295b7ad3d408712aecff2584c82931d6b4938c6128c2f00491b441b3bcdb29e654809e7e1ae5e167a37040db
+EBUILD openh264-2.3.0.ebuild 3621 BLAKE2B fbeea0b7a4f304d7c20fab467c7f6e77b0625cd91f7c8a16e8b5977fc0ec21d2ce67a038c0eb6a87dec3cfd6192803a5a47dcf58db19bb1afb850ae72fc09914 SHA512 0d80421e2f5041cd179ac59edc1b1197087c2ff08d67b6888394dabded813231decf8206bd96ae5cd0f77f4c4ac65bc17b195c49a2a992e217c8301a4f12d8b7
 MISC metadata.xml 569 BLAKE2B 14a021fba978f0156bab46178d05a6b9f8f67fdeba784d587759207fe60ea1d74a383eec3fc40662c39d33fcecb71d8cafe7eb6354383c253e0a3f7f1e94feae SHA512 ceb77117c6a50f16640b329368c86db26127b8e501475dbaca4c53ba41315b0fc7161f6d9268cb86d1f6dbf2cf867e2bb0e6b5f45240ab3227b99b734c344efd
diff --git a/media-libs/openh264/openh264-2.3.0.ebuild b/media-libs/openh264/openh264-2.3.0.ebuild
index 518d3060fe18..1eb4f62db3ce 100644
--- a/media-libs/openh264/openh264-2.3.0.ebuild
+++ b/media-libs/openh264/openh264-2.3.0.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure.
 #  https://github.com/cisco/openh264/issues/3459 )
 SLOT="0/6.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils"
 
 RESTRICT="bindist test"
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index de570254f8ad..15565a3d3cb1 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -3,6 +3,7 @@ DIST openimageio-2.3.13.0.tar.gz 32456755 BLAKE2B 897a7db0eabb9a7cc29ab8fea368c3
 DIST openimageio-2.3.15.0.tar.gz 32626322 BLAKE2B 1367e40dbed3d43b53db1b7117c563782396b255e366ea9586438a5c81cb8ae96ff42a0e445c7932bc92dc327adae921b383c2e6d787dc6e67cf71946d6174c1 SHA512 8ed0303fd9314e01cbf6d45627eb6e88e3fd356387a7657a4b31bbe455a4a493f88a2b511c1d5cf86a9c00346dbc03f9b32d2a6df9da033e7e78e86142ce888c
 DIST openimageio-2.3.16.0.tar.gz 32632560 BLAKE2B bde9d46b74135f03215cc3741c0378580dc34381da041b3d06ff50154627edd69b93e1a714bc99c7800fe952300f752cb9d8ca62b042ec91569dbbc9bc10950f SHA512 2249dfc7f9c4ede563d5ed05ed76557e0b81c35054832b4de2a7820c8619886afa3f260cd26b5f4291f74c9d9c16b9a2ac3772e23b5b70bc87c2c7a0d0c10726
 DIST openimageio-2.3.17.0.tar.gz 32640557 BLAKE2B 6e3df687e51615687b2e1f445b9a241fa703fec14f0f93e80c50ce6c2e035489be751656e62dd685bac59f983942615fe8a33eeae7e83fd93b037e58d86a248b SHA512 25cb1a671e7cd5154e363eef178ab091fd7d55868746a4394340567a794f6c6f0295e58721a5b4ee8bf66b4cc0e6a01c3e82f9cc9de9953ae349d45738a04700
+DIST openimageio-2.3.19.0.tar.gz 32641108 BLAKE2B f4fd3ca79beecd839b2510a03856d47a59312b33885e8561e60650c896de05738bf757805bea7f2fb659581bb19ffbd6894513dc925e0af80235da4a5c31c9ce SHA512 f59068d9935ea43e07532e24c45752dc206054034ac79a8ae3ce698343695a4faac7b71ea39bc856946eb084b4287413d75fc5700c59c8d6b409722f47f53072
 DIST openimageio-oexr-test-image-f17e353fbfcde3406fe02675f4d92aeae422a560.tar.gz 252226183 BLAKE2B b94fb08515e18821e5b88c10031ca53675c56f96397e00b4e186d8dfb9f8557bc935ff102d61835590dca6deeef90dba03b81fd76a7958ab4d0592c042c2130a SHA512 26b9b2cda9d48554b8a53f06bc20301f8ff77dc5e1d7caf9ec45aaaefd8578d3d4d4b2e0a1d1b0f697805fdc0c5d4bae4948cea21821df3006ac0f8b9020f85f
 DIST openimageio-oiio-test-image-b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb.tar.gz 137513393 BLAKE2B ebde02d57daaa58c08c7aab2251c39eefd5b736e1cc4a6d28603d8ee52b7828fa7529c9616207b8b0bcb04d88cd4c60c6325e6f09b4f3410dd6e61c5532b04ad SHA512 840a6785779d85f5da052cb635a92c27451e464414fefd2faaf5fc7a6b78936ff05a6a960c07bb968d7c18e753053ff0f425505de54577d30620fbff9be043fb
 EBUILD openimageio-2.3.12.0-r3.ebuild 4640 BLAKE2B 7eeca5be1bd3c8e1fc81bf0fd1116aa5448df61d8cacab682a68472171e430c3cc9e1e30640972a927f76770954b5d2491abcde1a1b552bce4695d177971386f SHA512 0bf5d25e8a636a7c1a670d4481d46258f1ed3b6bb33ad64f5203bb0d0f32abf75ab35870f54311b5c4285ef87c383ce88747806269d7659646ff97fa6ea5bd0e
@@ -10,4 +11,5 @@ EBUILD openimageio-2.3.13.0.ebuild 4654 BLAKE2B e9fad8d19fcabccb3cb318696fa65a9f
 EBUILD openimageio-2.3.15.0.ebuild 4652 BLAKE2B cbf5df67b5fc6461693c77758d5a2ded83a30973266f2bc5aa950f1c889a03510a6466ed4b9e67be01a8c46f52a7bd0867644613434bdaceaff8d8e76ff00080 SHA512 9ed6872bd72942c69981c30bce64019f7da0bcbad2aa7472426b93373837d0172d7f73cbcdf0fa0adcb38171eee470913f426a79c3740a3e06eb4bc62866428d
 EBUILD openimageio-2.3.16.0.ebuild 4654 BLAKE2B cebafc4a779e0e2d1ee40acfb3ada29440398f517183642fe720f1b4df169a6adcbb54aab92ea21658cc269cfb8f67647a6e37854abf2781d411e10c7bbe61d1 SHA512 0b7b997693bd9a2369cd9f2caec0f8ca4bfe76fd9a1f51f70ce059aa16a08ec0296c05bf175d5a27ca5e71f5748652cd2a98db0fbaab6a085fe8158f60e0b3d7
 EBUILD openimageio-2.3.17.0.ebuild 4652 BLAKE2B 1e86936f997353d21f9a0f96aa8f16e471651c13b15e7e9b31e12f6c7946126fd8839a62a03f600e252fc64f4b526f0e418689908e00c1827be80666d137c6cd SHA512 1f240ae24a1b6ac0f74df4f64b1c378289a952c7c8e7faf6f01dbe16760cafd8be350c153e5999d2117ad8787332e0eeeef9d5d3df0624349969dd1366a692da
+EBUILD openimageio-2.3.19.0.ebuild 4654 BLAKE2B cebafc4a779e0e2d1ee40acfb3ada29440398f517183642fe720f1b4df169a6adcbb54aab92ea21658cc269cfb8f67647a6e37854abf2781d411e10c7bbe61d1 SHA512 0b7b997693bd9a2369cd9f2caec0f8ca4bfe76fd9a1f51f70ce059aa16a08ec0296c05bf175d5a27ca5e71f5748652cd2a98db0fbaab6a085fe8158f60e0b3d7
 MISC metadata.xml 724 BLAKE2B 057b0c63428b1860a3b11442b9687b136a749935e3d0bb2e27eca00245d1d9e6f3e40aa796b723664b9b320d8c958a345812199ed04f8d1a476364a80c76e355 SHA512 5243cd4cac10b569e1488226b61c98012af13f50e32c023176e6a2ba29f7804e164b4774957b35f212bad62f496bb466b242d6bc1be44ca3ea0909371b9d5415
diff --git a/media-libs/openimageio/openimageio-2.3.19.0.ebuild b/media-libs/openimageio/openimageio-2.3.19.0.ebuild
new file mode 100644
index 000000000000..347165ba2e87
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.3.19.0.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{8..10} )
+
+TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
+inherit cmake font python-single-r1
+
+DESCRIPTION="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+	)"
+S="${WORKDIR}/oiio-${PV}"
+
+LICENSE="BSD"
+# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
+# for changing to openexr 3 which broke ABI.
+SLOT="0/$(ver_cut 1-2).1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+	avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Not quite working yet
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	>=dev-libs/imath-3.1.2-r4:=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	>=media-libs/openexr-3:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:=
+	dicom? ( sci-libs/dcmtk )
+	ffmpeg? ( media-video/ffmpeg:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+
+	if use test ; then
+		mkdir -p "${BUILD_DIR}"/testsuite || die
+		mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+		mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+	fi
+}
+
+src_configure() {
+	# Build with SIMD support
+	local cpufeature
+	local mysimd=()
+	for cpufeature in "${CPU_FEATURES[@]}"; do
+		use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+	done
+
+	# If no CPU SIMDs were used, completely disable them
+	[[ -z ${mysimd} ]] && mysimd=("0")
+
+	local mycmakeargs=(
+		-DVERBOSE=ON
+		-DBUILD_TESTING=$(usex test)
+		-DOIIO_BUILD_TESTS=$(usex test)
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_CCACHE=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-DUSE_FFMPEG=$(usex ffmpeg)
+		-DUSE_GIF=$(usex gif)
+		-DUSE_OPENJPEG=$(usex jpeg2k)
+		-DUSE_OPENCV=$(usex opencv)
+		-DUSE_OPENGL=$(usex opengl)
+		-DUSE_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+	if use python; then
+		mycmakeargs+=(
+			-DPYTHON_VERSION=${EPYTHON#python}
+			-DPYTHON_SITE_DIR=$(python_get_sitedir)
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index e8321986fd63..1a8657f068e6 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-2022.1.tar.gz 222009 BLAKE2B c6707699a49c130b2669620e11f52862790999954a84b05f9f54d238fb0ae68e2523cc4b86104b3d4bce4528db31be89e441b278a97a375b90d7e0f458075f51 SHA512 21c2462cb434d94da87c71ba660f6cd5b161450d7faeff8789b41db25e64f2baa7c560e78aa856d128c5a73699215d6b1085b5ca19a4640237adf194793ad44b
+DIST shaderc-2022.2.tar.gz 223386 BLAKE2B feb18bef51bea72574d784d4992e5b8514b0d1d70fbd9194ad842a361740ed3d66c6c3d2cf6114a0ef77279845ab686d01ad5fcd91cbddcc289cee4e521aec6a SHA512 85962f17d07496ba4cef3ad62dc7fd1967ff628449ceb1fec77336211fddbd2554ea94e5558cfaf2cfe4dcfdf6f56744d905714be7dbb776ba2bcd67e4665039
 EBUILD shaderc-2022.1-r2.ebuild 2091 BLAKE2B 85c675010f45ff5d83bac7b2bd86149ffcb0fe2fe04107e70d6a1da5f02bfdcddc22ebbb73f1cb06a9cc0398fabbec92282ce571220fc70acd5ab97d7d99797e SHA512 f322b1ef2d5e5d56e7aa418eb6ba205401e7edec2f2ab62f94bcccd95a445f5a55d3b2609bc89f8f8c5eab9cafd5017e7bb9c0a2dd62d7ae983a0007988cd8b0
+EBUILD shaderc-2022.2.ebuild 2096 BLAKE2B d06415ea74a7541dca202e3352272091a7772cc6312de1d5edf329cf24b8e4ee164710fa4fcb1dd7bab0e86699668ae5c5adda03b4397df9bb4b93ceef127ad0 SHA512 f75f0441f1d32b24443f29739a21d7ae7dbedcf7c61e71bb4e8a31e9dfbe56444f2f276f8b98dc264b89af6f067097f9c3e16921394c41b0a876c3abcffcaa7e
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2022.2.ebuild b/media-libs/shaderc/shaderc-2022.2.ebuild
new file mode 100644
index 000000000000..792146ea3a6c
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2022.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+	>=dev-util/glslang-1.3.224[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-1.3.224[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/spirv-headers-1.3.224
+	test? (	dev-cpp/gtest	)
+"
+BDEPEND="doc? ( dev-ruby/asciidoctor )
+	test? (	$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]') )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020.4-fix-build.patch
+)
+
+# https://github.com/google/shaderc/issues/470
+RESTRICT=test
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/nose[${PYTHON_USEDEP}]"
+	fi
+}
+
+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="$(usex !test)"
+		-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 b525282349a1..dfd74c594fff 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-layers-1.3.216.tar.gz 4036109 BLAKE2B 03772c0c34fb531366ad3f0e5610c21af013ed05b50f37eee20220385f3525f5a3ae0fcca5ab28b1cc0650057faf7a22db3f17b22187e09ddad7bd8425903ce4 SHA512 c3e3f44ddec4a440c759a5773cf8cabdb79e35152fd912b75ba7ef80126184fab7d0cd93e55e6f0a1b3fa5379295bf60dd21cbba97b3c24e753cd7b6ccb78f72
+DIST vulkan-layers-1.3.224.tar.gz 4193501 BLAKE2B 84982d63339a2ef101cf9e1e9038e94415326a4a8a46b47d0a913bd0d35fa333dd35579f96536c6e147bf37ccdee0a8de12c1c13b74d3529f34645f8e10f0fa2 SHA512 c7d4f6df4bf0cbb970b36cff9197306769bf3f86ea98496b93e8c1779a905966f6b2303b04ba84099ce9c12e828633e2e0db22e49060393335312508b3540488
 EBUILD vulkan-layers-1.3.216.ebuild 1495 BLAKE2B 36a564ae87d74cea6ccb1290799061ccf719377d489c74489fcfb92583956d3b0fc833212fc96d14384e08497ac887ff57be74d27ffadbcdb1202ce10d40bb23 SHA512 f5c8bb61e30baa93fe96fba65b60f6dec4116610ca1ccb85e53b8f31129a333d22d2ef6ccaef7581e6be62832923aba81b9230a2a1be64e258563a315e3f2999
+EBUILD vulkan-layers-1.3.224.ebuild 1501 BLAKE2B 891788bf6dfbe066d5e3c369ce0de65b3c9bf55f686baf67c0ba6f7b51d65f867c59391c093b79ce3960b7808c78840bf2bfb879d4124d15e04f60b43121d892 SHA512 551e4409385a1afba70f2f0c84a1db46767a5fe7941422283e31ea2d69c8293edbee112b1f0786d08f2cf0853adfee35938857362d83c586d6a2ee0e23eac644
 EBUILD vulkan-layers-9999.ebuild 1566 BLAKE2B fc055c417e7418009316fba9c9528b6238bb4aa66d98169a7f85d14399130a69821780f51c0998291c454d35366ae315368b576fe30c4a3568bbcf6f655215e7 SHA512 d8e30d5336fa269f029a78f4d2aa90dddcc75fed1465b398e6e04d992e046d31c2249e0c4876aecd47b82cd51d5b5860b753de8302f3168e9c30f11aef137114
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.224.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.224.ebuild
new file mode 100644
index 000000000000..559b4df68fec
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.224.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-ValidationLayers
+PYTHON_COMPAT=( python3_{8..10} )
+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/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+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/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_LAYER_SUPPORT_FILES=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 0fef38eae5b8..341e8fce0bd1 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-loader-1.3.216.tar.gz 1587902 BLAKE2B e51b3b2d49b2beb6272988d7a821dcbadd6e0c162a258c214dafe52b9ea041ad1e1bc014a72a86f2212c97ae5f6fd635fc649311c1437b7ffd110b02c7b8218e SHA512 92e2de415ae4e94b8c02abf77bbb41d2887c2fee6bb4fee75415bbaf7161cef2bfe245665acc47027ae08706a83e8aeb01656ded3d337252b5c84852ca94c9cc
+DIST vulkan-loader-1.3.224.tar.gz 1594886 BLAKE2B a2b548c1b2ce4b5a700dca2708fc628ebc6ae248b5c1750cc2fe33d24e3f8260007f1fd04f2f3f55984889708354ebebf21bcce73e24f1da23aba426718f053a SHA512 e75f0d399703606fc89a08783c5cc9a542d7e14073039d63df4aac673d2b246a5c5b0ac4acab5e0f276b533c47645af11606de96460066fd70ccaa6de1888b37
 EBUILD vulkan-loader-1.3.216.ebuild 1722 BLAKE2B c63c31356baef1b2a547f183d4be776b8c8826426b7ada3d2b17dd9583936f102917fbb082b398c929bdc54b87e01749308996ddf8ec80ac9efd6785c2b15eea SHA512 27b112a05d865d20cdd766fb46395967ee22966bfb481194636c340a8657bebc77f696d4d5a826d9b212c4ae6a1612ecc4e357634b4b4174269ac402665af89f
+EBUILD vulkan-loader-1.3.224.ebuild 1728 BLAKE2B 4e02e2516e5efe9509338a22e49fc58aec84424cb1d93a1da56262d9ac7a82ffc960b11c7dfdf6c75e7ca0c2b5ef7492b23560bed0b670cd2b490e960d8b3aaa SHA512 b9a286482431e3f8607f78e5975d897314114d6058f6f7e13d9ff9781a6b6ca8ab0b1beedde4d802f8e69ce412ef19816c683e0bb06a4017c9bab36315e1e274
 EBUILD vulkan-loader-9999.ebuild 1752 BLAKE2B b388bec1cfcb652262cd3da49722be05f8905a251949e8a69dca7dd29562bc77c1cd0dd95b1c100b7e30a6f242e88283bc1c159df284886fdd91052e4bfc059d SHA512 2a7b8d50a8317dd4ea7c454ccd5aefc3995f49a2e1c794161331c7fc8277d7dbe64b8ffcee3acc7b49675c9fe44994c91063527696aae137a52b59f3978d8ec3
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.224.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.224.ebuild
new file mode 100644
index 000000000000..873df8148a72
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.224.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-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"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+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
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}