gentoo auto-resync : 20:07:2022 - 08:41:03

15 files changed, 380 insertions, 46 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index e075f59619ff..481c833617c4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index 70c3c4184eed..a4928b73e7b1 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -3,5 +3,5 @@ DIST libqtxdg-3.8.0.tar.xz 76044 BLAKE2B c49f1317c55ea09c4fe9aaea3e96851c4e5dcbc
 DIST libqtxdg-3.9.1.tar.xz 71604 BLAKE2B 73db84890afa5b7177447a01ae2eb92db4bf13c6e3377a0ac7bdda192b15f8cd068db2875c13ba37d7d27a2c28e48d435801625b11ec8f7eb602fa02b5eca841 SHA512 1b05a10649229a34e3b653c37abefbb02c8b456d77aaabed0e47668818ee29730ea049d96bc5c71c9ad83d1c9c87888195bf228dc9817fd27053f0286752978c
 EBUILD libqtxdg-3.7.1.ebuild 1118 BLAKE2B c248274bcbcf8b5dcba932fa50c625795aa35f22cc5be314e1ec39f713ad257bf5caa55f04011ef07f7587c9a14fe13c1b2863c85b86448511532757b17094f8 SHA512 6d2722f2bc7a32820106164fdf4cd7dc8ea8734aa54f126b54c459d9299722229246682c1bfa5ae6ed8adbc65e3e408889b948cde153bf1631e0bc94ddb128a2
 EBUILD libqtxdg-3.8.0.ebuild 1169 BLAKE2B dff2e3805870839fcc595143e4e63bacbd1696dedbb0d7558ce02733f4628037b623f3c4df013d2e91ef14e585099c43e5eaa9e69ffdb57506b9ebaef3ac09ad SHA512 f5aec3e2c9c36261a2eec1a81b05018f5696b0c81d226dac213103fbb2d34787db99b46d067969ad5703507181955d1ef36dda5ce808e425fe8c504906daddbd
-EBUILD libqtxdg-3.9.1.ebuild 1196 BLAKE2B f8710cd39a91f42df36e762b913c08b85cedd919e4bd9f5b2b7856772d1d3d4fe81f85232b190a54b28b8b42e86d20767d4a93d612b5cfb6d3ffd4d1b22e1f27 SHA512 145f4d8ca85bf38438c6e4b04da956746ce6035873a3b9a79dff14f3b2af6f880186e1e415630f9055e633af9411db72b371cc32aa293843d7d89d0e10266c8d
+EBUILD libqtxdg-3.9.1.ebuild 1195 BLAKE2B 805acdc37c85c6175d9bf45d1651c7e156819b14edd25dc7921f39320b1f6f0f512a341b9b4f50de554441ced5934b454ade228e898feece7d4d81c5b732a917 SHA512 2c1b68384480a28301035854d643b8c8747df45ad5d542aab094d1e2305c3c1b71501248d0596463e85f9a02318b7594fc71c1441c32d1b1b16c9a4ac9bf3dac
 MISC metadata.xml 423 BLAKE2B 6205fdbb66e8286d35f33cd497befee8128750eecf8ca674c578937ae1fdd34f4036e91c7719e9333c78a4a5a6fdd3082b7ffc6fcfb839f2d7cb9218ba92a837 SHA512 0097795563b8aba727267461be9ff727fc738c1efa182ba9c8d9e15c7d334efc41fae1c402b09315ad41c8af179f9ad1dfa1d0b055cfd072b2e013227c36edc4
diff --git a/dev-libs/libqtxdg/libqtxdg-3.9.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.9.1.ebuild
index 68967f171547..c1b38373434c 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.9.1.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.9.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/libvterm-neovim/Manifest b/dev-libs/libvterm-neovim/Manifest
deleted file mode 100644
index 4774d79a2883..000000000000
--- a/dev-libs/libvterm-neovim/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libvterm-neovim-0.0_pre20150621.tar.xz 52240 BLAKE2B 040c2510356a03c4b5b98197a2353285e23025fb8377396fafd4dce3b1afdf0d969e067317f5eb08878fbe69cca601ac85c8dc6cc51416f58e0611100bd54f5d SHA512 e6fe678da5498177d7fbd0cd945600b643f7cd76ff9ed00f3ac7923be55793765429a2f2da5fba4055dfaa4b7200c28a021f3672ce7ae16b99e58738e5093fd8
-EBUILD libvterm-neovim-0.0_pre20150621.ebuild 735 BLAKE2B bf581ece4bcdbf5ddc51267b602c1b08d5af35d9cd2d90c9d63e543ae08cf01fa1802e29cbe8226914302bd4433f6d52bc7e0773e00366fc348c5831c607f1f6 SHA512 ee569a31ca412770df084c109c4694d26841ac26b216dec06249d12a2b82a789ff11d120a32e14d07721816b3c1aeee35c735b6f2fc7b1f16c3acb07758151e3
-MISC metadata.xml 256 BLAKE2B a2cc41acd036354767d8637d65524b95dd6a79ae0126f7e6ba61abd53bf681cc4b7eb8f06c2842be9a634ef4b6820aa20bf7931debb508b2e819706665dd6eef SHA512 bd920ac1d3d1ac26afc3685652533d93bed59162ce9acab9f44cf4548f75ebcec2a1713f0f596a1d3e08a06a72fa27c56331a19321eeae5bce74e8a10a79ae70
diff --git a/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild b/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild
deleted file mode 100644
index 83c8e6b97293..000000000000
--- a/dev-libs/libvterm-neovim/libvterm-neovim-0.0_pre20150621.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
-HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="sys-devel/libtool
-	virtual/pkgconfig"
-
-src_compile() {
-	append-cflags -fPIC
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-	find "${ED}" -name '*.la' -o -name "*.a" -delete || die
-
-	dodoc -r doc/.
-}
diff --git a/dev-libs/libvterm-neovim/metadata.xml b/dev-libs/libvterm-neovim/metadata.xml
deleted file mode 100644
index 2e4c5182444f..000000000000
--- a/dev-libs/libvterm-neovim/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>vim@gentoo.org</email>
-    <name>Gentoo Vim Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index ba2804abb367..173de5a0f470 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,5 +1,5 @@
 DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e
 DIST libzip-1.9.2.tar.xz 763980 BLAKE2B ceeca4dccbe7552f7f545b00ea44b342398d18eb996e39045b9d6efafe50f8890333ddf220c86b59f5ab2849420eb76761c42b16de8b174629f53e327f9e83e7 SHA512 82cb2533c25b5b540aa73856c958750d32eeceb192cce257eded15b396a24652041c8531f20366ac4c2dc6b7c0310c558d19c12b611576eccb07cfbaf98120b5
 EBUILD libzip-1.8.0-r1.ebuild 2444 BLAKE2B adc40f870375d1c3bd5753018108985f34b4e2eebd20b8205c6368086bc9dd0a289b7f3c6484969740712b9ef315d18abb0fbe628256b72ffb8c6f3c789abc1c SHA512 467c9a3a7f17c018384b10e679364ecaf9c41762f155d1da0c3438a2cdcd210426726ea7662a532f44c058bb0958a9b0371c1b6ac776b205949448f9ca3fe4c2
-EBUILD libzip-1.9.2.ebuild 2452 BLAKE2B 0e9a40f854339b7a206ebbea483835524f59b2a37d829f17195fba8e2238ee39035ec24fb4b1eb928f905f58ef45e873b8c36f76296e7aa7736fd5ad0379f281 SHA512 97123443fc12a1b521202b907b7cf877913b81dc3cbe49a960a975b966391e82ef0a149df58320af269692e3caa09033acc4a06c84a85d4ca4789f0794213848
+EBUILD libzip-1.9.2.ebuild 2449 BLAKE2B 5c5225e6bf3d6f311c32ad1c99a7a3b70301980153b63651051c1f0384697efff69bbe9a340f38ecdc1808c8cd5897646e2f8c688a8460f0f9d70e76c1c303a2 SHA512 f37a2811a12704b834523e5eead46b0c405707ae45143ae156f26e566aa910f490a9545be68284141c92d144c2e670d3f5a8f7e9b804a524f402619553e7b901
 MISC metadata.xml 510 BLAKE2B cd0e88d175985805badcbe4b6aa771fd65ab9e8e86a3d37e18531e61ef9fac92ba191ba4a3806c37743a51541b1f353f5bf58b7195898de74eb2c389623a6994 SHA512 e073a6f074e9d5dc8abffada8338c608915527ab3c76f693cd261c6a99aef73e18c0e0088d508d62032619f779f1c6d9445cdd0273aeb61e41b9e3b449762337
diff --git a/dev-libs/libzip/libzip-1.9.2.ebuild b/dev-libs/libzip/libzip-1.9.2.ebuild
index 0a706c57e930..20517344615c 100644
--- a/dev-libs/libzip/libzip-1.9.2.ebuild
+++ b/dev-libs/libzip/libzip-1.9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools zstd"
 REQUIRED_USE="test? ( tools )"
 
diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index 862179626371..4eeb32150ed9 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -1,4 +1,8 @@
+AUX pocl-3.0-fix-version.patch 354 BLAKE2B 8e2b4570c204dc37bb70f20b01838f0c21a6aec57c258a206eb5e82bed69fe01d65f704cfd184c102102fd3a06eb75fb092a2ccfa4d8729192451fa894afc7e9 SHA512 bfe023132ab8080c8539a783586f9c556e7ae4cb8113c3c96b33ac02bd7d4044b36bf13e1556e181af9c12acb4b0e0778af25fd66df1fe6e7ab533c2b68108c4
+AUX pocl-3.0-icd.patch 5679 BLAKE2B 4f9edba1e71afb8c059da8f1adcb59f0ccca1bb33ad0c05eb2d3b27c1e7ea6bfa3a2d60f6e6c83136146275aed35a6501713883dad72011379e0ed4ae64eba74 SHA512 436b7f6e53372f00a8c70bb00229d22d05f24687ba2822f4b26590cbdffe64e8c2909d2f1ab6e0650fe18db7507c6bba9f5bcee1a09ec1fe5b42955ddcb99db7
 AUX vendor_opencl_libs_location.patch 962 BLAKE2B 6d0e3f070fa2022d95d35fb1563f72f5dc1b544c7f83417dbb5e3d100dad07bdf3365a48ee92e856de4edc4b7c25674b45efd6d0ace1ac559273641ca175a269 SHA512 2ae144e7590049cc1eac8fa30e360cd511331abba0dfe683867d6a089742ea12cc3bc48dafe41a1c1c9b891fdf35aaac8b14cc1e10a78d2ab49b5e14635bb258
 DIST pocl-1.8.tar.gz 1614545 BLAKE2B b0ccc08d1f899719f5def731c61727440035a879ebeebae89dd406423eba6c12b866f34cd47dd0e0f944b7f0c4569c57c44a9a62bf02552de5c4c3b8c9fb3b48 SHA512 bcbb3fa3d2234d4c5b0c17863eba0bc4c8f13f863cc58cfd1de49e21fa7bf0aec82b81aec143c81885e3a39274c8ae783b2f03b9a12846e024204d6ed0e59a9d
+DIST pocl-3.0.tar.gz 1722809 BLAKE2B 095d3d1dca3fa7ebdf61e6e34bf444755dd6842c4f16e0f80895337e96508056465d332309d38ee4db6d6b0031e1dfce350485750e59bfe0dea5951eba5fd3e4 SHA512 dc02bdf259792edb5cb3c80cde5c5261e1e21219b4b31420a3b537abbca1bc478ce0ca0dfc622727088b67d580217d47566309de7c6114a24553de4496a209ea
 EBUILD pocl-1.8-r2.ebuild 3121 BLAKE2B 23434ed062197c4e656febf58cb286deb8e14b3f98eb99c4b624d09545117203171378b954fa25557313b1fc22288aa4fde435b3d4e900aad83e499b2bf27469 SHA512 68a4ae0feb2e6e3e87b25ce8ef7064ec428bb1fd4fbffd2dc6b78dd79e6146b31b617c6ff1fa2e9236e6c38ce5c472a585d2178be30202efe348c9ba2a2f70f0
-MISC metadata.xml 1199 BLAKE2B 90d31048bcc33a76837977547ba818b2d2a268c408e7ad40eb157864d7c561d0bbc8ad40a013e28c74092f27f7fc3d23ae52322a2ca2d681c109ace154e29214 SHA512 98341aa0795cf9439ed4c0b8e2575657eaa5898e21b64d7d73592badac0b2a82fe061005a6adcf4e9d3318a4f20b80c62bd379f587dd4fcf993a95017f8ce867
+EBUILD pocl-3.0.ebuild 3656 BLAKE2B 17cb07719ab059d2d0d7081453e751a754e1b962d3105876c5b474b79887a000f03934d93317c5dc2641ba8bae82bb333ea2d7b142c0402b27264bf8efd952ed SHA512 8e980fcba437b88a665e89662394a2fc2fcd512af4e1e544aa7e38f4664cc327ae45d053b1e1b26fe206486656787cb5decc360d07f0c70ce8aa3878aaa3c67e
+MISC metadata.xml 1265 BLAKE2B 857cd7ad6dae95355a8102678be5ac4628eecc4b3135ed910b06e9bb5cb5df4473ba6228cd54908717ec87386e7ae41322e8546403648f5d90cd1db57eec8861 SHA512 800fdb1d3c430cd4c4cf3a9792297708cf7779863da2e477327d0bc21c2f4ed83b599f1b703efa31b144140cd2c657a18fc76ce0a7dc5db51e7e27f202ac0e0b
diff --git a/dev-libs/pocl/files/pocl-3.0-fix-version.patch b/dev-libs/pocl/files/pocl-3.0-fix-version.patch
new file mode 100644
index 000000000000..8ae428036340
--- /dev/null
+++ b/dev-libs/pocl/files/pocl-3.0-fix-version.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -73,7 +73,7 @@ endif()
+ 
+ set(MAJOR_VERSION 3)
+ set(MINOR_VERSION 0)
+-set(VERSION_SUFFIX_FIXED_TEXT "-rc2")
++set(VERSION_SUFFIX_FIXED_TEXT "")
+ set(VERSION_SUFFIX "${VERSION_SUFFIX_FIXED_TEXT}")
+ set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}${VERSION_SUFFIX})
+ set(POCL_VERSION_BASE ${VERSION_STRING})
diff --git a/dev-libs/pocl/files/pocl-3.0-icd.patch b/dev-libs/pocl/files/pocl-3.0-icd.patch
new file mode 100644
index 000000000000..f64e633e2f53
--- /dev/null
+++ b/dev-libs/pocl/files/pocl-3.0-icd.patch
@@ -0,0 +1,127 @@
+From 408fe60850977ab9c68d174a42ae4a5f3455cab1 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 20 Jul 2022 04:59:11 +0000
+Subject: [PATCH] CMake: fix build without ocl-icd
+
+If not using ocl-icd (in this case, I was using dev-libs/opencl-icd-loader),
+OCL_ICD_INCLUDE_DIRS and friends won't be defined and CMake bails out
+with an error:
+```
+-- Configuring done
+CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
+Please set them or make sure they are set and tested correctly in the CMake files:
+/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/OCL_ICD_INCLUDE_DIRS
+   used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL
+   used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL
+/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/OCL_ICD_INCLUDE_DIRS
+   used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices
+/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/basic/OCL_ICD_INCLUDE_DIRS
+   used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/basic
+/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/pthread/OCL_ICD_INCLUDE_DIRS
+   used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/pthread
+/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/topology/OCL_ICD_INCLUDE_DIRS
+   used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/CL/devices/topology
+/var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/llvmopencl/OCL_ICD_INCLUDE_DIRS
+   used as include directory in directory /var/tmp/portage/dev-libs/pocl-3.0/work/pocl-3.0/lib/llvmopencl
+```
+
+This broke in 3ecda3b294d70e4f915ad141d669f4bc1298f606.
+
+To fix, just check if the value is truthy before using (this is enough
+for checking if it's NOTFOUND).
+--- a/lib/CL/CMakeLists.txt
++++ b/lib/CL/CMakeLists.txt
+@@ -179,7 +179,9 @@ endif()
+ add_library("pocl_cache" OBJECT "pocl_cache.c")
+ harden("pocl_cache")
+ 
+-target_include_directories("pocl_cache" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
++if(${OCL_ICD_INCLUDE_DIRS})
++  target_include_directories("pocl_cache" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
++endif()
+ 
+ 
+ if (ENABLE_LLVM)
+@@ -190,7 +192,9 @@ if (ENABLE_LLVM)
+   add_library("lib_cl_llvm" OBJECT ${LLVM_API_SOURCES})
+   harden("lib_cl_llvm")
+ 
+-  target_include_directories("lib_cl_llvm" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
++  if(${OCL_ICD_INCLUDE_DIRS})
++    target_include_directories("lib_cl_llvm" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
++  endif()
+ 
+   list(APPEND LIBPOCL_OBJS "$<TARGET_OBJECTS:llvmpasses>")
+   list(APPEND LIBPOCL_OBJS "$<TARGET_OBJECTS:lib_cl_llvm>")
+@@ -200,7 +204,9 @@ if (ENABLE_LLVM)
+ endif()
+ 
+ if(ENABLE_ICD)
+-  add_compile_options(${OCL_ICD_CFLAGS})
++  if(${OCL_ICD_CFLAGS})
++    add_compile_options(${OCL_ICD_CFLAGS})
++  endif()
+ endif()
+ 
+ if(HAVE_LTTNG_UST)
+--- a/lib/CL/devices/CMakeLists.txt
++++ b/lib/CL/devices/CMakeLists.txt
+@@ -28,7 +28,9 @@ if(ENABLE_LOADABLE_DRIVERS)
+   function(add_pocl_device_library name)
+     add_library(${name} SHARED ${ARGN})
+     harden("${name}")
+-    target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
++    if(${OCL_ICD_INCLUDE_DIRS})
++      target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
++    endif()
+     target_link_libraries(${name} PUBLIC ${POCL_PUBLIC_LINK_LIST} PRIVATE ${POCL_LIBRARY_NAME} ${POCL_PRIVATE_LINK_LIST})
+     set_target_properties(${name} PROPERTIES PREFIX "lib" SUFFIX ".so")
+     install(TARGETS ${name} LIBRARY DESTINATION "${POCL_INSTALL_PRIVATE_LIBDIR}" COMPONENT "lib")
+@@ -38,7 +40,9 @@ else()
+ 
+   function(add_pocl_device_library name)
+     add_library(${name} OBJECT ${ARGN})
+-    target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
++    if(${OCL_ICD_INCLUDE_DIRS})
++      target_include_directories(${name} SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
++    endif()
+   endfunction()
+ 
+ endif()
+@@ -143,7 +147,9 @@ if(MSVC)
+   set_source_files_properties( ${POCL_DEVICES_SOURCES} PROPERTIES LANGUAGE CXX )
+ endif(MSVC)
+ add_library("pocl-devices" OBJECT ${POCL_DEVICES_SOURCES})
+-target_include_directories("pocl-devices" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
++if(${OCL_ICD_INCLUDE_DIRS})
++  target_include_directories("pocl-devices" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
++endif()
+ set(POCL_DEVICES_OBJS "${POCL_DEVICES_OBJS}"
+     "$<TARGET_OBJECTS:pocl-devices>")
+ harden("pocl-devices")
+--- a/lib/CL/devices/topology/CMakeLists.txt
++++ b/lib/CL/devices/topology/CMakeLists.txt
+@@ -30,7 +30,9 @@ endif(MSVC)
+ add_library("pocl-devices-topology" OBJECT pocl_topology.c pocl_topology.h)
+ harden("pocl-devices-topology")
+ 
+-target_include_directories("pocl-devices-topology" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
++if(${OCL_ICD_INCLUDE_DIRS})
++  target_include_directories("pocl-devices-topology" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
++endif()
+ 
+ if(Hwloc_FOUND)
+         target_include_directories("pocl-devices-topology" SYSTEM PUBLIC ${Hwloc_INCLUDE_DIRS})
+--- a/lib/llvmopencl/CMakeLists.txt
++++ b/lib/llvmopencl/CMakeLists.txt
+@@ -101,7 +101,9 @@ endif(MSVC)
+ add_library("llvmpasses" OBJECT ${LLVMPASSES_SOURCES})
+ harden("llvmpasses")
+ 
+-target_include_directories("llvmpasses" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
++if(${OCL_ICD_INCLUDE_DIRS})
++  target_include_directories("llvmpasses" SYSTEM PUBLIC ${OCL_ICD_INCLUDE_DIRS})
++endif()
+ 
+ option(ENABLE_LIBLLVMOPENCL "Build separate libllvmopencl.so for use with 'opt'" OFF)
+ if(ENABLE_LIBLLVMOPENCL)
diff --git a/dev-libs/pocl/metadata.xml b/dev-libs/pocl/metadata.xml
index 1e1a7087abb5..9e73154528e9 100644
--- a/dev-libs/pocl/metadata.xml
+++ b/dev-libs/pocl/metadata.xml
@@ -14,6 +14,7 @@
 		<!--<flag name="hsa">Enable the HSA base profile runtime device driver</flag>-->
 		<flag name="hwloc">Enable hwloc support</flag>
 		<flag name="memmanager">Enables custom memory manager. Except for special circumstances, this should be disabled</flag>
+		<flag name="lto">Adds support for link time optimization</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">pocl/pocl</remote-id>
diff --git a/dev-libs/pocl/pocl-3.0.ebuild b/dev-libs/pocl/pocl-3.0.ebuild
new file mode 100644
index 000000000000..629cf11a51ed
--- /dev/null
+++ b/dev-libs/pocl/pocl-3.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_AUTODOC=0
+DOCS_BUILDER="sphinx"
+DOCS_DIR="doc/sphinx/source"
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+LLVM_MAX_SLOT=14
+
+inherit cmake llvm python-any-r1 docs
+
+DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
+HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl"
+SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+# TODO: hsa tce
+IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager lto test"
+# Tests not yet passing, fragile in Portage environment(?)
+RESTRICT="!test? ( test ) test"
+
+# TODO: add dependencies for cuda
+# Note: No := on LLVM because it pulls in Clang
+# see llvm.eclass for why
+CLANG_DEPS="!cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= )
+	cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_NVPTX] )"
+RDEPEND="
+	dev-libs/libltdl
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):*
+	virtual/opencl
+
+	${CLANG_DEPS}
+	debug? ( dev-util/lttng-ust:= )
+	hwloc? ( sys-apps/hwloc:=[cuda?] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${CLANG_DEPS}
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]')
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-icd.patch
+	"${FILESDIR}"/${P}-fix-version.patch
+)
+
+python_check_deps() {
+	has_version -b "<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]"
+}
+
+llvm_check_deps() {
+	local usedep=$(usex cuda "[llvm_targets_NVPTX]" '')
+
+	# Clang is used at both build time (executed) and runtime
+	has_version -r "sys-devel/llvm:${LLVM_SLOT}${usedep}" && \
+		has_version -r "sys-devel/clang:${LLVM_SLOT}${usedep}" && \
+		has_version -b "sys-devel/clang:${LLVM_SLOT}${usedep}"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+
+	llvm_pkg_setup
+}
+
+src_configure() {
+	local host_cpu_variants="generic"
+
+	if use amd64 ; then
+		# Use pocl's curated list of CPU variants which should contain a good match for any given amd64 CPU
+		host_cpu_variants="distro"
+	elif use ppc64 ; then
+		# A selection of architectures in which new Altivec / VSX features were added
+		# This attempts to recreate the amd64 "distro" option for ppc64
+		# See discussion in bug #831859
+		host_cpu_variants="pwr10;pwr9;pwr8;pwr7;pwr6;g5;a2;generic"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_HSA=OFF
+
+		-DENABLE_ICD=ON
+		-DPOCL_ICD_ABSOLUTE_PATH=ON
+		-DPOCL_INSTALL_PUBLIC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/pocl"
+
+		-DENABLE_IPO=$(usex lto)
+
+		-DENABLE_POCL_BUILDING=ON
+		-DKERNELLIB_HOST_CPU_VARIANTS="${host_cpu_variants}"
+
+		-DSTATIC_LLVM=OFF
+		-DWITH_LLVM_CONFIG=$(get_llvm_prefix -d "${LLVM_MAX_SLOT}")/bin/llvm-config
+
+		-DENABLE_ACCEL_DEVICE=$(usex accel)
+		-DENABLE_CONFORMANCE=$(usex conformance)
+		-DENABLE_CUDA=$(usex cuda)
+		-DENABLE_HWLOC=$(usex hwloc)
+		-DENABLE_POCL_FLOAT_CONVERSION=$(usex float-conversion)
+		-DHARDENING_ENABLE=$(usex hardening)
+		-DPOCL_DEBUG_MESSAGES=$(usex debug)
+		-DUSE_POCL_MEMMANAGER=$(usex memmanager)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+src_test() {
+	export POCL_BUILDING=1
+	export POCL_DEVICES=basic
+	export CTEST_OUTPUT_ON_FAILURE=1
+	export TEST_VERBOSE=1
+
+	# Referenced https://github.com/pocl/pocl/blob/master/.drone.yml
+	# But couldn't seem to get tests working yet
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	dodoc CREDITS README CHANGES
+
+	if use doc; then
+		dodoc -r _build/html
+		docompress -x /usr/share/doc/${P}/html
+	fi
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${P}/examples
+	fi
+}
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index 9bb42cef6b02..294436599a8d 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -7,12 +7,15 @@ DIST simdjson-1.0.2.tar.gz 1551616 BLAKE2B 534e312de977b82604595ccf889348545ed35
 DIST simdjson-1.1.0.tar.gz 1555845 BLAKE2B 6dfd4e938b9f1f6a6314f39929b74a7e822fbb37510914eb3db0660b9bbf68ef0b2fb4c45aa2e1246f6530d3848d0055220d4c5ead3093f97956a6154b22a899 SHA512 f8718bd039e1a25f0b95880b957c43e6eba6eada6bb7f58cedde37669a46b15b3ff9f4c4ea775e1cf949657642ef0472fa8bac5bdc98882df63e7f292fb5a723
 DIST simdjson-2.0.4.gh.tar.gz 1612055 BLAKE2B af60f4ae6780eb4068ac85c2d6784539b14fad6b7871c091f2ec3dc4f8cc9add8510f4d92a8db6ea305a1c2cc6919c8f8604d31d4e939677f3ed121b53891c24 SHA512 5d993939aece8555dc7fc5d63be14103af4ca164fb0cd53ac96578ed8a9fac61f974c247544ad007710c7a710bfaea7ad94098a143c713097237cd47c7792463
 DIST simdjson-2.1.0.gh.tar.gz 1618798 BLAKE2B 019e04ae5c5d0e43bf81734edb72d969d95fa4325f2e9aa51258d71587a6d71e4f26edd9beb2797fbf420ee4d7434985e7d960943dacedfab3a6afe616ca20b9 SHA512 6689349195ac4f0f94d47915f90b69663b6a010523fcf58fbe8bb3815db946c65208104c6f1e5d97e42cc1e1b883e5488c059df0afcc7f6e648e2ab3eb97af13
+DIST simdjson-2.2.1.gh.tar.gz 1622666 BLAKE2B 188c693ab7284103dbbd9d3a23348ba14a4453d549082577a9c5de949cdf6ad72410aa42a4928331f89981b1d3594aa5ebfc3bb48277e47f2534b29ee6931cae SHA512 0eea6e0d6cb1744f5e21dced93ffb55d60bb68c24ec6b0465455a29a9da8a471750929d9975970fe0d07b5a8fe667b5976cfb544ed39956d797a999ff98e5766
 DIST simdjson-data-1.0.2.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 DIST simdjson-data-1.1.0.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 DIST simdjson-data-2.0.4.gh.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 DIST simdjson-data-2.1.0.gh.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
+DIST simdjson-data-2.2.1.gh.tar.gz 6635706 BLAKE2B 563376147f18d590a176a5a0398365db1a3e677b773c018f335efa7fff05ac22ac5dc37613792082a32e6c9b91a773a590f7dfd15efa5ba660f9142b128b28a7 SHA512 168198404b11b8c76ff4f53645d7b5a88a5c72b4a5b6646b4410859ec3416ae9b37fc59f7d2f014ccc785615ea5c31dc00b145dbb1a7acb701b94029dd4ea1e1
 EBUILD simdjson-1.0.2.ebuild 1835 BLAKE2B a6aed9d075d74a17c1e27a94eef4f83414705e797987445d8000565989730f1accbf832ca531f05ba8fe7feb388b1ce2abcc250ff3286cda5489c76fa56f3d4b SHA512 c20ff75ec5887825b30564f0e6cd48bc533bcdff290cd278b09b87a53cbd5685b066b87c0bdc148959f6424feceaa9910b975f52875e450bb32f484ec17986d9
 EBUILD simdjson-1.1.0.ebuild 1836 BLAKE2B 4138055e3875f3fbe8179bf6a28763f269f1e91bb72ded3ace4a7b158fe2e701e0ae7b6de4e615085d7348fa9951d3eb09cf16ec6a103279c29812d3ebbab536 SHA512 b02ed933a900e8a43a9e9bf31c50367dae27e40dce1da1f6532607a3154b53e197cb0d30897f0e40b08480afd7c4ae29531b463d5a1cb60b49f320858d4167db
 EBUILD simdjson-2.0.4.ebuild 1842 BLAKE2B f7ddb79888fc5224565e6e58203db7c22f444732d159ca55efd6a0af4617f23db7e8a7ea0eebf828ab2285dc4a6ce9b030238bcaa10c7c162313a3b0ccc21e7c SHA512 c42d70b050e1819f0e735bd06a7cf306fb3bd57328499a573f69775a362089c6eb214d5171f385384e6c66bbd6cc6df02c70c8b553d8aae322db127267a2a4c3
 EBUILD simdjson-2.1.0-r1.ebuild 1843 BLAKE2B e7048ec0f2ecee5481551faf3275a0b02ede89cfdce97d466b2ee48c2bde561127ab2c0a0c33e76fb7157d961f616df6ef38e1f16bb3b5e0cb71f7cfc0255d40 SHA512 5591ea1c18f56d6341ed60c30f644b23d17013e7004da0f270b3cda5f2709911978e9318eb6e135559152aa61b834bdb09308cd5d179e318dfbab36c8aa5a0c9
+EBUILD simdjson-2.2.1.ebuild 1944 BLAKE2B 4f677e417e9556d5bd7044dd22e844ee9192ed69890800c2c957df44fd17b693c9ce45c6550525cb6528becd975064d444854cb38c4b7b280a024fc9349e5ef4 SHA512 5d04913b39bfc174ea856156816cafc7601cde569edb4d2404a9bf1b1ef09b7b2d4161e2ff6b006ae04381bc4af6b7878e85cceddebf4b18d79fb38cc42e0d6c
 MISC metadata.xml 336 BLAKE2B e734f879a36d4e77dade86545e210039d032a5b9a909b414c63855f62d9015122305496eb7faeb752a6bc96cc7c6287164da29ab9442faf13e3d261e0329b299 SHA512 fdc9e0f98c2d9f7e7e5997f2922d9ad7be2defa93ca3b30e29e7a458147a32fe9e02cda9fe9df4035bde0a077372d7f109337a08a4dea1b898a0444082c858c0
diff --git a/dev-libs/simdjson/simdjson-2.2.1.ebuild b/dev-libs/simdjson/simdjson-2.2.1.ebuild
new file mode 100644
index 000000000000..7df57819e2e7
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-2.2.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs cmake
+
+DATA_HASH="a5b13babe65c1bba7186b41b43d4cbdc20a5c470"
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+	https://simdjson.org/
+	https://github.com/simdjson/simdjson
+"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	test? ( https://github.com/${PN}/${PN}-data/archive/${DATA_HASH}.tar.gz -> ${PN}-data-${PV}.gh.tar.gz )
+"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD MIT"
+SLOT="0/13"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+	sys-apps/file
+	sys-apps/grep
+"
+DEPEND="
+	tools? ( dev-libs/cxxopts:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/simdjson-1.0.0-dont-bundle-cxxopts.patch"
+	"${FILESDIR}/simdjson-0.9.0-tests.patch"
+	"${FILESDIR}/simdjson-1.0.0-dont-fetch-data-tarball.patch"
+	"${FILESDIR}/simdjson-1.0.0-install-tools.patch"
+	"${FILESDIR}/simdjson-1.0.0-tests.patch"
+)
+
+DOCS=(
+	AUTHORS
+	CONTRIBUTING.md
+	CONTRIBUTORS
+	HACKING.md
+	README.md
+)
+
+src_prepare() {
+	if use test; then
+		mv "${WORKDIR}/${PN}-data-${DATA_HASH}" "${S}/dependencies/${PN}-data" || die
+	fi
+
+	sed -e 's:-Werror ::' -i cmake/developer-options.cmake || die
+	sed -e '/Werror/ d ; /Werror/ d ' -i tests/ondemand/compilation_failure_tests/CMakeLists.txt || die
+	sed -e "s:^c++ :$(tc-getCXX) :" -i singleheader/README.md || die
+	mv tools/{,simd}jsonpointer.cpp || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSIMDJSON_ENABLE_THREADS=ON
+	)
+	use test && mycmakeargs+=(
+		-DSIMDJSON_TESTS=ON
+	)
+
+	if use tools; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE=ON
+			-DSIMDJSON_ALLOW_DOWNLOADS=OFF
+			-DSIMDJSON_GOOGLE_BENCHMARKS=OFF
+			-DSIMDJSON_COMPETITION=OFF
+			-DSIMDJSON_TOOLS=ON
+		)
+	elif ! use test; then
+		mycmakeargs+=(
+			-DSIMDJSON_DEVELOPER_MODE=OFF
+		)
+	fi
+
+	cmake_src_configure
+}