Merge updates from master

16 files changed, 706 insertions, 66 deletions

diff --git a/app-admin/salt/files/salt-3004.1-jinja-3.patch b/app-admin/salt/files/salt-3004.1-jinja-3.patch
deleted file mode 100644
index 98f21bc35129..000000000000
--- a/app-admin/salt/files/salt-3004.1-jinja-3.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/salt/utils/jinja.py b/salt/utils/jinja.py
-index 0cb70bf64a..322c2f7f46 100644
---- a/salt/utils/jinja.py
-+++ b/salt/utils/jinja.py
-@@ -25,10 +25,11 @@ import salt.utils.json
- import salt.utils.stringutils
- import salt.utils.url
- import salt.utils.yaml
--from jinja2 import BaseLoader, Markup, TemplateNotFound, nodes
-+from jinja2 import BaseLoader, TemplateNotFound, nodes
- from jinja2.environment import TemplateModule
- from jinja2.exceptions import TemplateRuntimeError
- from jinja2.ext import Extension
-+from markupsafe import Markup
- from salt.exceptions import TemplateError
- from salt.utils.decorators.jinja import jinja_filter, jinja_global, jinja_test
- from salt.utils.odict import OrderedDict
-@@ -706,7 +707,7 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
-     return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs)
- 
- 
--@jinja2.contextfunction
-+@jinja2.pass_context
- def show_full_context(ctx):
-     return salt.utils.data.simple_types_filter(
-         {key: value for key, value in ctx.items()}
-diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py
-index 6502831aff..dec847364a 100644
---- a/tests/unit/utils/test_jinja.py
-+++ b/tests/unit/utils/test_jinja.py
-@@ -22,7 +22,8 @@ import salt.utils.files
- import salt.utils.json
- import salt.utils.stringutils
- import salt.utils.yaml
--from jinja2 import DictLoader, Environment, Markup, exceptions
-+from jinja2 import DictLoader, Environment, exceptions
-+from markupsafe import Markup
- from salt.exceptions import SaltRenderError
- from salt.utils.decorators.jinja import JinjaFilter
- from salt.utils.jinja import (
diff --git a/dev-libs/ncnn/ncnn-20220729.ebuild b/dev-libs/ncnn/ncnn-20220729-r1.ebuild
index 3fc052ceb245..b9a75ef23130 100644
--- a/dev-libs/ncnn/ncnn-20220729.ebuild
+++ b/dev-libs/ncnn/ncnn-20220729-r1.ebuild
@@ -21,7 +21,7 @@ RESTRICT="test"
 RDEPEND="
 	tools? ( dev-libs/protobuf:= )
 	vulkan? (
-		dev-util/glslang
+		dev-util/glslang:=
 		media-libs/vulkan-loader
 	)"
 DEPEND="
diff --git a/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch b/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch
new file mode 100644
index 000000000000..b7ed014d92b3
--- /dev/null
+++ b/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch
@@ -0,0 +1,57 @@
+diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
+index b44cbc73..41f6de93 100644
+--- a/OGLCompilersDLL/CMakeLists.txt
++++ b/OGLCompilersDLL/CMakeLists.txt
+@@ -41,7 +41,7 @@ if(WIN32)
+     source_group("Source" FILES ${SOURCES})
+ endif(WIN32)
+ 
+-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
++if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OGLCompiler EXPORT glslang-targets)
+ 
+     # Backward compatibility
+@@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
+         message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+ 
+         if (NOT TARGET glslang::OGLCompiler)
+-            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\")
+         endif()
+ 
+         add_library(OGLCompiler ALIAS glslang::OGLCompiler)
+diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
+index a8b14911..57ec1efd 100644
+--- a/glslang/CMakeLists.txt
++++ b/glslang/CMakeLists.txt
+@@ -203,7 +203,7 @@ endif()
+ ################################################################################
+ if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS glslang EXPORT glslang-targets)
+-    if(NOT BUILD_SHARED_LIBS)
++    if(BUILD_SHARED_LIBS)
+         install(TARGETS MachineIndependent EXPORT glslang-targets)
+         install(TARGETS GenericCodeGen EXPORT glslang-targets)
+ 
+diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
+index 16eb939b..959788dc 100644
+--- a/glslang/OSDependent/Unix/CMakeLists.txt
++++ b/glslang/OSDependent/Unix/CMakeLists.txt
+@@ -52,7 +52,7 @@ else()
+     target_link_libraries(OSDependent Threads::Threads)
+ endif()
+ 
+-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
++if(ENABLE_GLSLANG_INSTALL)
+     install(TARGETS OSDependent EXPORT glslang-targets)
+ 
+     # Backward compatibility
+@@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
+         message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
+ 
+         if (NOT TARGET glslang::OSDependent)
+-            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
++            include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\")
+         endif()
+ 
+         add_library(OSDependent ALIAS glslang::OSDependent)
diff --git a/dev-util/glslang/glslang-1.3.231.ebuild b/dev-util/glslang/glslang-1.3.231-r1.ebuild
index a87aaeeb9345..dc652e36d9b8 100644
--- a/dev-util/glslang/glslang-1.3.231.ebuild
+++ b/dev-util/glslang/glslang-1.3.231-r1.ebuild
@@ -19,8 +19,10 @@ fi
 DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
 HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
 
+PATCHES=( "${FILESDIR}/${P}-Install-static-libs.patch" )
+
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/1"
 
 BDEPEND="${PYTHON_DEPS}"
 
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index a87aaeeb9345..1f9728bad96e 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -19,8 +19,10 @@ fi
 DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
 HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https://github.com/KhronosGroup/glslang"
 
+PATCHES=( "${FILESDIR}/${PN}-1.3.231-Install-static-libs.patch" )
+
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/1"
 
 BDEPEND="${PYTHON_DEPS}"
 
diff --git a/eclass/font.eclass b/eclass/font.eclass
index 4970c959f7cd..0196755ce3e1 100644
--- a/eclass/font.eclass
+++ b/eclass/font.eclass
@@ -186,12 +186,6 @@ font_src_install() {
 # @DESCRIPTION:
 # Updates fontcache if !prefix and media-libs/fontconfig installed
 _update_fontcache() {
-	if [[ -d "${EROOT}"/usr/share/fonts ]] ; then
-		# unreadable font files = fontconfig segfaults
-		find "${EROOT}"/usr/share/fonts/ -type f '!' -perm 0644 \
-			-exec chmod -v 0644 2>/dev/null {} + || die "failed to fix font files perms"
-	fi
-
 	if [[ -z ${ROOT} ]] ; then
 		if has_version media-libs/fontconfig ; then
 			ebegin "Updating global fontcache"
diff --git a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
index 70ad93064b5f..f24d067c4121 100644
--- a/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
+++ b/media-fonts/x11fonts-jmk/x11fonts-jmk-3.0-r4.ebuild
@@ -32,6 +32,6 @@ src_configure() {
 }
 
 src_install() {
-	emake install INSTALL_DIR="${ED}/usr/share/fonts/jmk"
+	emake install INSTDATFLAGS="-m 0644" INSTALL_DIR="${ED}/usr/share/fonts/jmk"
 	einstalldocs
 }
diff --git a/media-gfx/renderdoc/files/renderdoc-1.22-r1-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.22-r1-system-glslang.patch
new file mode 100644
index 000000000000..7b5b88a53625
--- /dev/null
+++ b/media-gfx/renderdoc/files/renderdoc-1.22-r1-system-glslang.patch
@@ -0,0 +1,215 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 857c848b9..0423b3e3c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -448,6 +448,17 @@ elseif(UNIX)
+     endif()
+ endif()
+ 
++# glslang package does not export a -config.cmake file.
++option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory")
++include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake")
++include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake")
++include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake")
++include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake")
++include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake")
++if(NOT TARGET glslang OR NOT TARGET SPIRV)
++  message(FATAL_ERROR "glslang or SPIRV target not found")
++endif()
++
+ add_subdirectory(renderdoc)
+ 
+ # these variables are handled within the CMakeLists.txt in qrenderdoc,
+diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
+index a26438d76..9ee043959 100644
+--- a/renderdoc/CMakeLists.txt
++++ b/renderdoc/CMakeLists.txt
+@@ -601,7 +601,7 @@ endif()
+ add_library(renderdoc SHARED ${renderdoc_objects})
+ target_compile_definitions(renderdoc ${RDOC_DEFINITIONS})
+ target_include_directories(renderdoc ${RDOC_INCLUDES})
+-target_link_libraries(renderdoc ${RDOC_LIBRARIES})
++target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang SPIRV)
+ 
+ add_dependencies(renderdoc renderdoc_libentry)
+ 
+diff --git a/renderdoc/data/glsl_shaders.cpp b/renderdoc/data/glsl_shaders.cpp
+index dd79c1f89..5295fb05e 100644
+--- a/renderdoc/data/glsl_shaders.cpp
++++ b/renderdoc/data/glsl_shaders.cpp
+@@ -26,7 +26,7 @@
+ #include "common/common.h"
+ #include "common/formatting.h"
+ #include "driver/shaders/spirv/glslang_compile.h"
+-#include "glslang/glslang/Public/ShaderLang.h"
++#include <glslang/Public/ShaderLang.h>
+ #include "os/os_specific.h"
+ 
+ #define GLSL_HEADERS(HEADER) \
+diff --git a/renderdoc/driver/gl/gl_shader_refl.cpp b/renderdoc/driver/gl/gl_shader_refl.cpp
+index dfd871f32..57b5aeca6 100644
+--- a/renderdoc/driver/gl/gl_shader_refl.cpp
++++ b/renderdoc/driver/gl/gl_shader_refl.cpp
+@@ -26,7 +26,7 @@
+ #include <algorithm>
+ #include <functional>
+ #include "driver/shaders/spirv/glslang_compile.h"
+-#include "glslang/glslang/Public/ShaderLang.h"
++#include <glslang/Public/ShaderLang.h>
+ #include "gl_driver.h"
+ 
+ template <>
+diff --git a/renderdoc/driver/shaders/spirv/CMakeLists.txt b/renderdoc/driver/shaders/spirv/CMakeLists.txt
+index e5f2f4113..79525b5f6 100644
+--- a/renderdoc/driver/shaders/spirv/CMakeLists.txt
++++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt
+@@ -1,91 +1,3 @@
+-set(glslang_dir ${RDOC_SOURCE_DIR}/3rdparty/glslang)
+-set(glslang_sources
+-    ${glslang_dir}/OGLCompilersDLL/InitializeDll.cpp
+-    ${glslang_dir}/OGLCompilersDLL/InitializeDll.h
+-    ${glslang_dir}/SPIRV/GlslangToSpv.cpp
+-    ${glslang_dir}/SPIRV/GlslangToSpv.h
+-    ${glslang_dir}/SPIRV/GLSL.std.450.h
+-    ${glslang_dir}/SPIRV/GLSL.ext.AMD.h
+-    ${glslang_dir}/SPIRV/GLSL.ext.EXT.h
+-    ${glslang_dir}/SPIRV/GLSL.ext.KHR.h
+-    ${glslang_dir}/SPIRV/GLSL.ext.NV.h
+-    ${glslang_dir}/SPIRV/hex_float.h
+-    ${glslang_dir}/SPIRV/InReadableOrder.cpp
+-    ${glslang_dir}/SPIRV/Logger.cpp
+-    ${glslang_dir}/SPIRV/Logger.h
+-    ${glslang_dir}/SPIRV/SpvBuilder.cpp
+-    ${glslang_dir}/SPIRV/SpvBuilder.h
+-    ${glslang_dir}/SPIRV/SpvTools.cpp
+-    ${glslang_dir}/SPIRV/SpvTools.h
+-    ${glslang_dir}/SPIRV/SpvPostProcess.cpp
+-    ${glslang_dir}/SPIRV/spvIR.h
+-    ${glslang_dir}/glslang/GenericCodeGen/CodeGen.cpp
+-    ${glslang_dir}/glslang/GenericCodeGen/Link.cpp
+-    ${glslang_dir}/glslang/Include/arrays.h
+-    ${glslang_dir}/glslang/Include/BaseTypes.h
+-    ${glslang_dir}/glslang/Include/Common.h
+-    ${glslang_dir}/glslang/Include/ConstantUnion.h
+-    ${glslang_dir}/glslang/Include/InfoSink.h
+-    ${glslang_dir}/glslang/Include/InitializeGlobals.h
+-    ${glslang_dir}/glslang/Include/intermediate.h
+-    ${glslang_dir}/glslang/Include/PoolAlloc.h
+-    ${glslang_dir}/glslang/Include/ResourceLimits.h
+-    ${glslang_dir}/glslang/Include/revision.h
+-    ${glslang_dir}/glslang/Include/ShHandle.h
+-    ${glslang_dir}/glslang/Include/Types.h
+-    ${glslang_dir}/glslang/MachineIndependent/Constant.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp.h
+-    ${glslang_dir}/glslang/MachineIndependent/gl_types.h
+-    ${glslang_dir}/glslang/MachineIndependent/iomapper.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/iomapper.h
+-    ${glslang_dir}/glslang/MachineIndependent/gl_types.h
+-    ${glslang_dir}/glslang/MachineIndependent/InfoSink.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/Initialize.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/Initialize.h
+-    ${glslang_dir}/glslang/MachineIndependent/Intermediate.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/intermOut.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/IntermTraverse.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/limits.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/linkValidate.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/LiveTraverser.h
+-    ${glslang_dir}/glslang/MachineIndependent/localintermediate.h
+-    ${glslang_dir}/glslang/MachineIndependent/parseConst.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/ParseContextBase.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/ParseHelper.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/ParseHelper.h
+-    ${glslang_dir}/glslang/MachineIndependent/PoolAlloc.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.h
+-    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpAtom.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.h
+-    ${glslang_dir}/glslang/MachineIndependent/preprocessor/Pp.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpScanner.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.h
+-    ${glslang_dir}/glslang/MachineIndependent/reflection.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/reflection.h
+-    ${glslang_dir}/glslang/MachineIndependent/RemoveTree.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/RemoveTree.h
+-    ${glslang_dir}/glslang/MachineIndependent/ScanContext.h
+-    ${glslang_dir}/glslang/MachineIndependent/Scan.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/Scan.h
+-    ${glslang_dir}/glslang/MachineIndependent/ShaderLang.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/SymbolTable.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/SymbolTable.h
+-    ${glslang_dir}/glslang/MachineIndependent/Versions.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/Versions.h
+-    ${glslang_dir}/glslang/MachineIndependent/attribute.cpp
+-    ${glslang_dir}/glslang/MachineIndependent/attribute.h
+-    ${glslang_dir}/glslang/OSDependent/osinclude.h
+-    ${glslang_dir}/glslang/Public/ShaderLang.h)
+-
+-if(UNIX)
+-    list(APPEND glslang_sources
+-        ${glslang_dir}/glslang/OSDependent/Unix/ossource.cpp)
+-endif()
+-
+ set(sources
+     glslang_compile.cpp
+     glslang_compile.h
+@@ -108,8 +20,7 @@ set(sources
+     spirv_processor.h
+     spirv_disassemble.cpp
+     spirv_stringise.cpp
+-    var_dispatch_helpers.h
+-    ${glslang_sources})
++    var_dispatch_helpers.h)
+ 
+ add_definitions(-DAMD_EXTENSIONS)
+ add_definitions(-DNV_EXTENSIONS)
+diff --git a/renderdoc/driver/shaders/spirv/glslang_compile.cpp b/renderdoc/driver/shaders/spirv/glslang_compile.cpp
+index e2f1f2df8..fc0adab99 100644
+--- a/renderdoc/driver/shaders/spirv/glslang_compile.cpp
++++ b/renderdoc/driver/shaders/spirv/glslang_compile.cpp
+@@ -29,8 +29,8 @@
+ #undef min
+ #undef max
+ 
+-#include "glslang/glslang/Include/Types.h"
+-#include "glslang/glslang/Public/ShaderLang.h"
++#include <glslang/Include/Types.h>
++#include <glslang/Public/ShaderLang.h>
+ 
+ static bool glslang_inited = false;
+ rdcarray<glslang::TShader *> *allocatedShaders = NULL;
+@@ -129,7 +129,16 @@ static TBuiltInResource DefaultResources = {
+     /*.maxTaskWorkGroupSizeY_NV =*/1,
+     /*.maxTaskWorkGroupSizeZ_NV =*/1,
+     /*.maxMeshViewCountNV =*/4,
+-
++    /*.maxMeshOutputVerticesEXT = */ 256,
++    /*.maxMeshOutputPrimitivesEXT = */ 256,
++    /*.maxMeshWorkGroupSizeX_EXT = */ 128,
++    /*.maxMeshWorkGroupSizeY_EXT = */ 128,
++    /*.maxMeshWorkGroupSizeZ_EXT = */ 128,
++    /*.maxTaskWorkGroupSizeX_EXT = */ 128,
++    /*.maxTaskWorkGroupSizeY_EXT = */ 128,
++    /*.maxTaskWorkGroupSizeZ_EXT = */ 128,
++    /*.maxMeshViewCountEXT = */ 4,
++    /*.maxDualSourceDrawBuffersEXT =*/1,
+     /*.limits*/
+     {
+         /*.limits.nonInductiveForLoops =*/1,
+diff --git a/renderdoc/driver/shaders/spirv/spirv_compile.cpp b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
+index 8fbf2f16a..49bd322f4 100644
+--- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp
++++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
+@@ -31,8 +31,8 @@
+ #undef min
+ #undef max
+ 
+-#include "glslang/SPIRV/GlslangToSpv.h"
+-#include "glslang/glslang/Public/ShaderLang.h"
++#include <glslang/SPIRV/GlslangToSpv.h>
++#include <glslang/Public/ShaderLang.h>
+ 
+ rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray<rdcstr> &sources,
+                        rdcarray<uint32_t> &spirv)
diff --git a/media-gfx/renderdoc/renderdoc-1.22-r1.ebuild b/media-gfx/renderdoc/renderdoc-1.22-r1.ebuild
new file mode 100644
index 000000000000..a7491c866ecf
--- /dev/null
+++ b/media-gfx/renderdoc/renderdoc-1.22-r1.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# The swig fork is required for compatibility with both provided and
+# 3rd-party Python scripts.  Required patch was sent to upstream in
+# 2014: https://github.com/swig/swig/pull/251
+MY_SWIG_VER=7
+MY_SWIG=swig-${PN}-${MY_SWIG_VER}
+
+AUTOTOOLS_AUTO_DEPEND="no"
+DOCS_BUILDER="sphinx"
+DOCS_DIR="docs"
+# For Python 3.11, see https://github.com/baldurk/renderdoc/issues/2730
+PYTHON_COMPAT=( python3_{9,10} )
+inherit autotools cmake flag-o-matic optfeature python-single-r1 docs qmake-utils verify-sig xdg
+
+DESCRIPTION="A stand-alone graphics debugging tool"
+HOMEPAGE="https://renderdoc.org https://github.com/baldurk/renderdoc"
+SRC_URI="
+	https://github.com/baldurk/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	qt5? ( https://github.com/baldurk/swig/archive/${PN}-modified-${MY_SWIG_VER}.tar.gz -> ${MY_SWIG}.tar.gz )
+	verify-sig? ( https://github.com/baldurk/renderdoc/releases/download/v${PV}/v${PV}.tar.gz.asc -> ${P}.tar.gz.asc )
+"
+
+# renderdoc: MIT
+#   + cmdline: BSD (not compatible with upstream lib)
+#   + farm fresh icons: CC-BY-3.0
+#   + half: MIT (not compatible with system dev-libs/half)
+#   + include-bin ZLIB (upstream doesn't exist anymore, maintained in tree)
+#   + md5: public-domain
+#   + plthook: BSD-2
+#   + pugixml: MIT
+#   + radeon gpu analyzer: MIT
+#   + source code pro: OFL-1.1
+#   + stb: public-domain
+#   + tinyfiledialogs: ZLIB
+#   + docs? ( sphinx.paramlinks: MIT )
+# swig: GPL-3+ BSD BSD-2
+LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="pyside2 qt5"
+REQUIRED_USE="doc? ( qt5 ) pyside2? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	dev-libs/miniz:=
+	>=dev-util/glslang-1.3.231:=
+	x11-libs/libX11
+	x11-libs/libxcb:=
+	x11-libs/xcb-util-keysyms
+	virtual/opengl
+	pyside2? (
+		$(python_gen_cond_dep '
+			dev-python/pyside2[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		${PYTHON_DEPS}
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5[ssl]
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+	)
+"
+DEPEND="${RDEPEND}"
+# qtcore provides qmake, which is required to build the qrenderdoc gui.
+BDEPEND="
+	x11-base/xorg-proto
+	virtual/pkgconfig
+	qt5? (
+		${AUTOTOOLS_DEPEND}
+		${PYTHON_DEPS}
+		dev-libs/libpcre
+		dev-qt/qtcore:5
+		sys-devel/bison
+	)
+	verify-sig? ( sec-keys/openpgp-keys-baldurkarlsson )
+"
+
+PATCHES=(
+	# The analytics seem very reasonable, and even without this patch
+	# they are NOT sent before the user accepts.  But default the
+	# selection to off, just in case.
+	"${FILESDIR}"/${PN}-1.18-analytics-off.patch
+
+	# Only search for PySide2 if pyside2 USE flag is set.
+	# Bug #833627
+	"${FILESDIR}"/${PN}-1.18-conditional-pyside.patch
+
+	# Pass CXXFLAGS and LDFLAGS through to qmake when qrenderdoc is
+	# built.
+	"${FILESDIR}"/${PN}-1.18-system-flags.patch
+
+	# Needed to prevent sandbox violations during build.
+	"${FILESDIR}"/${PN}-1.18-env-home.patch
+
+	"${FILESDIR}"/${PN}-1.22-r1-system-glslang.patch
+	"${FILESDIR}"/${PN}-1.18-system-compress.patch
+)
+
+DOCS=( util/LINUX_DIST_README )
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/baldurkarlsson.gpg
+
+pkg_setup() {
+	use qt5 && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if use verify-sig; then
+	   verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+
+	# Do not unpack the swig sources here.  CMake will do that if
+	# required.
+	unpack ${P}.tar.gz
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Ensure that we use the system glslang headers instead of the
+	# vendored copy.
+	rm -r renderdoc/3rdparty/glslang || die 'rm vendored glslang failed'
+
+	# Remove the calls to install the documentation files.  Instead,
+	# install them with einstalldocs.
+	sed -i '/share\/doc\/renderdoc/d' \
+		"${S}"/CMakeLists.txt "${S}"/qrenderdoc/CMakeLists.txt \
+		|| die 'sed remove doc install failed'
+
+	# Assumes that the build directory is "${S}"/build, which it is not.
+	sed -i "s|../build/lib|${BUILD_DIR}/lib|" \
+		"${S}"/docs/conf.py \
+		|| die 'sed patch doc sys.path failed'
+
+	# Bug #836235
+	sed -i '/#include <stdarg/i #include <time.h>' \
+		"${S}"/renderdoc/os/os_specific.h \
+		|| die 'sed include time.h failed'
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Build system does not know that this is a tagged release, as
+		# we just have the tarball and not the git repository.
+		-DBUILD_VERSION_STABLE=ON
+
+		-DENABLE_EGL=ON
+		-DENABLE_GL=ON
+		-DENABLE_GLES=ON
+		-DENABLE_PYRENDERDOC=$(usex qt5)
+		-DENABLE_QRENDERDOC=$(usex qt5)
+		-DENABLE_VULKAN=ON
+
+		# Upstream says that this option is unsupported and should not
+		# be used yet.
+		-DENABLE_WAYLAND=OFF
+
+		-DENABLE_XCB=ON
+		-DENABLE_XLIB=ON
+
+		# Path to glslang*.cmake.
+		-DGLSLANG_TARGET_DIR="${ESYSROOT}"/usr/$(get_libdir)/cmake
+
+		# renderdoc_capture.json is installed here
+		-DVULKAN_LAYER_FOLDER="${EPREFIX}"/etc/vulkan/implicit_layer.d
+	)
+
+	use qt5 && mycmakeargs+=(
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DRENDERDOC_SWIG_PACKAGE="${DISTDIR}"/${MY_SWIG}.tar.gz
+
+		# Needed after qtchooser removal, bug #836474.
+		-DQMAKE_QT5_COMMAND="$(qt5_get_bindir)"/qmake
+
+		-DQRENDERDOC_ENABLE_PYSIDE2=$(usex pyside2)
+	)
+
+	use pyside2 && mycmakeargs+=( -DPYTHON_CONFIG_SUFFIX=-${EPYTHON} )
+
+	# Lots of type mismatch issues.
+	filter-lto
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "android remote contexts" dev-util/android-tools
+	optfeature "vulkan contexts" media-libs/vulkan-loader
+}
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 157bd0b00fcb..3b1d30e0ec48 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1 +1,2 @@
 DIST shaderc-2022.2.tar.gz 223386 BLAKE2B feb18bef51bea72574d784d4992e5b8514b0d1d70fbd9194ad842a361740ed3d66c6c3d2cf6114a0ef77279845ab686d01ad5fcd91cbddcc289cee4e521aec6a SHA512 85962f17d07496ba4cef3ad62dc7fd1967ff628449ceb1fec77336211fddbd2554ea94e5558cfaf2cfe4dcfdf6f56744d905714be7dbb776ba2bcd67e4665039
+DIST shaderc-2022.3.tar.gz 223478 BLAKE2B 6b00677464a916618f0f204c650a89a3a74fcfd463a4e9476f16f8ff3f1079979da2e42f30dff93ddb1d509cb117c03e50508661f8de892157334ad0e477fd3c SHA512 a0ac3350defb89e39de79eba64a3648d24fd4d764be2df3193cabc1976d4a8f6bd8ebe296b02cc53788c8b74d66e8bcea3fe1266f7ad1c7e0e5a0d70ecb842ee
diff --git a/media-libs/shaderc/shaderc-2022.3.ebuild b/media-libs/shaderc/shaderc-2022.3.ebuild
new file mode 100644
index 000000000000..5098336ac7d9
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2022.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+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"
+
+RDEPEND="
+	>=dev-util/glslang-1.3.231:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-1.3.231[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/spirv-headers-1.3.231"
+
+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/net-libs/gssdp/Manifest b/net-libs/gssdp/Manifest
index d9cf515bb4c7..7293de73ae5d 100644
--- a/net-libs/gssdp/Manifest
+++ b/net-libs/gssdp/Manifest
@@ -1,2 +1,3 @@
 DIST gssdp-1.4.0.1.tar.xz 1229264 BLAKE2B b94e46c79ad0615f976bad4b8efe9dbcaa27105b3189ee23ff349002d175ff83b0a9507846a23f0d8b5ed1e98381658f863a77bec6beff83933ebae5458a6b0e SHA512 c2132b27f49071941be1ad9bd1e642b8b82341aac7e10b87d8a9a0ed3d88759ab6730a4a05ddb904af5e0799602c470b9e83a987c72ec3c1444b7aaef0e36ad8
 DIST gssdp-1.6.0.tar.xz 1232568 BLAKE2B f9c76a867d77f19dbb5f3c8e58177884ebe32a822793dcfdbc12c7a3e80aea5eb56e3212fbf0949535bbf5d1b4eb51a0696c3fbf8c50fce33c9616d94b97d28a SHA512 ad631a869059be06521f093f578228a1c51c7df1eb1be0cf1d2e09ed769c639119565f5af4e252deb336a7edb8d500e6d391b72bb0fd870abd2485874f9f1d8f
+DIST gssdp-1.6.1.tar.xz 2080496 BLAKE2B 29453e746daed62fe651ba726a3bc7ae2d64bdaf08340ecd5647eaf535dbd2960da56e46b36f87bb73054403514b88787f25e4e9e014506864f35e88b579d0d1 SHA512 4569a74252efb597cddd774a9648f899dc784837a164595f7c8d851892a9fbcee7bbf926c136be5cbd72314fabaae0cdbffba941393f62d2d967e3be4146c5ca
diff --git a/net-libs/gssdp/gssdp-1.6.1.ebuild b/net-libs/gssdp/gssdp-1.6.1.ebuild
new file mode 100644
index 000000000000..2fb0e8d7fd18
--- /dev/null
+++ b/net-libs/gssdp/gssdp-1.6.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org meson-multilib vala xdg
+
+DESCRIPTION="GObject-based API for handling resource discovery and announcement over SSDP"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gssdp"
+
+LICENSE="LGPL-2+"
+SLOT="1.6/1.6-0" # <API version>-<soname>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="gtk gtk-doc +introspection +vala"
+REQUIRED_USE="
+	gtk-doc? ( introspection )
+	vala? ( introspection )
+"
+
+# has file collision with Slot 0 (/usr/bin/gssdp-device-sniffer), so we remove that from this build
+# and depend on the other slot that has the file as well
+RDEPEND="
+	>=dev-libs/glib-2.70:2[${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.99.0:3.0[${MULTILIB_USEDEP},introspection?]
+	gtk? ( gui-libs/gtk:4 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	>=net-libs/gssdp-1.4:0
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gi-docgen-2021.1
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	virtual/pkgconfig
+	vala? (
+		$(vala_depend)
+		net-libs/libsoup:3.0[vala]
+	)
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		# Never use gi-docgen subproject
+		--wrap-mode nofallback
+
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_native_use_bool gtk sniffer)
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	if use gtk-doc ; then
+		mkdir "${ED}"/usr/share/gtk-doc || die
+		mv "${ED}"/usr/share/{doc,gtk-doc}/gssdp-1.6 || die
+	fi
+	rm "${ED}"/usr/bin/gssdp-device-sniffer || die # because of file collision with slot 0
+}
diff --git a/net-libs/gupnp/Manifest b/net-libs/gupnp/Manifest
index 9433f035c5fe..58dd7bd7d213 100644
--- a/net-libs/gupnp/Manifest
+++ b/net-libs/gupnp/Manifest
@@ -1,2 +1,3 @@
 DIST gupnp-1.4.3.tar.xz 154812 BLAKE2B b41a8805853061399412f5eb7267e9913adb3054ebf8a3bd78f6df4c1607d4a944654f3bc6e154fefa98f1289a80055d0feb0168801d83a1ad59c25f5fcac784 SHA512 1963ce917458168c8bc5d669ee30a4071d83d3768ce1be8cbbd81c767853ca01950623a88628a0b1e403d1cce1f0bbc9df80acf4b75f91bfc0403e0d0e6bcedb
 DIST gupnp-1.6.0.tar.xz 2212044 BLAKE2B bc10b405f79845dd6a86c9110d26430bd6c67d36c761e38ddeee01135c27d196dbdc32fe09f322f9c0e19d2d424bb4f8b042531c81ce9da18e3f3d4f2d93e255 SHA512 5cf7a6c27f5b183e4f4387e478cb6f3ccdf4169a8e6a878f087ebf61aa41d31181480a42a8c38155af8a410c342dc6140a9cc44e30295f8f10333fd12fa53cc4
+DIST gupnp-1.6.1.tar.xz 2215460 BLAKE2B 8bac4cfbe2fde421746be093db0043cf7333d647963a7a79c470247c6adbe58eee164b1b70f349e7aedeb7ccefb29d963beab02fc1e752306bf8587357154f4c SHA512 eccdf79eb4291af0720cda8aaf0d352eb71816ace5483bc68ede899d42d1d0b359558cc74017ceff8d0bf591b188794735b3d10d71ba85cb2b376038c7de1761
diff --git a/net-libs/gupnp/gupnp-1.6.1.ebuild b/net-libs/gupnp/gupnp-1.6.1.ebuild
new file mode 100644
index 000000000000..14582c85caaa
--- /dev/null
+++ b/net-libs/gupnp/gupnp-1.6.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit gnome.org meson-multilib python-single-r1 vala xdg
+
+DESCRIPTION="An object-oriented framework for creating UPnP devs and control points"
+HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP https://gitlab.gnome.org/GNOME/gupnp"
+
+LICENSE="LGPL-2+ GPL-2+" # gupnp-binding-tool is GPL-2+
+SLOT="1.6/1.6-0" # <API version>-<soname>
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+IUSE="connman gtk-doc +introspection networkmanager +vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( connman networkmanager )
+	gtk-doc? ( introspection )
+"
+
+# prefix: uuid dependency can be adapted to non-linux platforms
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.70:2[${MULTILIB_USEDEP}]
+	>=net-libs/gssdp-1.5.2:1.6=[introspection?,${MULTILIB_USEDEP}]
+	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
+	>=net-libs/libsoup-2.99.0:3.0[introspection?,${MULTILIB_USEDEP}]
+	>=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gi-docgen-2021.1 )
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	virtual/pkgconfig
+	!connman? ( !networkmanager? ( kernel_linux? ( sys-kernel/linux-headers ) ) )
+	vala? ( $(vala_depend)
+		>=net-libs/gssdp-1.5.2:1.6[vala]
+		net-libs/libsoup:3.0[vala]
+	)
+"
+
+src_prepare() {
+	default
+	use vala && vala_setup
+}
+
+multilib_src_configure() {
+	local backend=system
+	use kernel_linux && backend=linux
+	use connman && backend=connman
+	use networkmanager && backend=network-manager
+
+	local emesonargs=(
+		-Dcontext_manager=${backend}
+		$(meson_native_use_bool introspection)
+		$(meson_native_use_bool vala vapi)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		-Dexamples=false
+	)
+	meson_src_configure
+}
+
+multilib_src_install_all() {
+	python_fix_shebang "${ED}"/usr/bin/gupnp-binding-tool-1.6
+	if use gtk-doc ; then
+		mkdir "${ED}"/usr/share/gtk-doc || die
+		mv "${ED}"/usr/share/{doc,gtk-doc}/gupnp-1.6 || die
+	fi
+}
diff --git a/profiles/package.mask b/profiles/package.mask
index 729b04d12cae..6305bc3cc77a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -57,22 +57,6 @@ dev-python/tempita
 # Removal on 2022-12-04.  Bug #879515.
 dev-python/watchgod
 
-# Ionen Wolkens <ionen@gentoo.org> (2022-11-02)
-# glslang breaks ABI (leading to crashes until consumers are rebuilt)
-# and prevents re-building packages which used this part of the ABI
-# directly. Temporary mask until the situation improves.
-# WARNING: If you've already managed to build packages that used
-#          this version, they should be rebuilt after downgrading.
-# https://bugs.gentoo.org/879149
-# https://github.com/KhronosGroup/glslang/issues/3052
-~dev-util/glslang-1.3.231
-~dev-util/spirv-headers-1.3.231
-~dev-util/spirv-tools-1.3.231
-~dev-util/vulkan-headers-1.3.231
-~dev-util/vulkan-tools-1.3.231
-~media-libs/vulkan-layers-1.3.231
-~media-libs/vulkan-loader-1.3.231
-
 # Matt Turner <mattst88@gentoo.org> (2022-11-01)
 # Added by a proxied maintainer in 2018 who then never touched it again before
 # disappearing. Doesn't build with Python 3.9. Depends on gnome-base/gconf.