gentoo auto-resync : 23:04:2023 - 18:08:08

9 files changed, 105 insertions, 108 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 157d1b92520a..8be2c08c2486 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 1406922769ef..8b88f9e083c8 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,6 +1,3 @@
-AUX conan-1.59.0_nodesemver.patch 1511 BLAKE2B d2e6ac235c20b0a1d573ac82981616645baf7f9316ca31dee2719c3e60fd6a875d049064e89c6a9fa7c0612b830d0bf8281a87b7edccfb1b9ab1f6930c80de8b SHA512 e5ac706884722b0e22b39bd2421327dfb2da4e608a8eebb94d8a2a033ffd8101109858338447abb13247ba6c4b5b50764011be56679a4fbdd28b3842313f6796
-DIST conan-1.59.0.gh.tar.gz 1572455 BLAKE2B ab29fc6d86aca26271d8736185dbd7761984101e8489b57390a5073b680f4bffef957c4367030112acf8b2bf6e8ef867efd38eeece4081fe63d1f1f3ecf5b8c1 SHA512 101d00529a22623626ad0098539411c2411a1fd44d198b9d125c4c7d38527db6efb0a9eb5a9e77fd8d70436f9c4f60131458e3ca2c20c3385fcd32c20a4dd2db
-DIST conan-2.0.0.gh.tar.gz 884673 BLAKE2B 21872c34583a34efe3a64742b208f512e1b275ba2baea87e77e54173b7425ce2707c1fd1191ec3fab00552015a2b62a3013af3cda613a377a715d17e3ffce8fe SHA512 bd196e9960562519562ce32324664fe254e6e1248b19e89c69454984a8825691e869be2b5fc72373687ef3197a639cb13eda1a19f68a54716cb0dfd7cb313fa8
-EBUILD conan-1.59.0.ebuild 1830 BLAKE2B 1ed2d192145c00d3cdfe5ffa29013f005a10ae6122943e834d492fbffa20bde77ce76298080bae18d491c43d7f737069bbff283ddb9f45d6a1a4124147f79314 SHA512 0775a177a47c1635ab9fe7d67a8e3b8905d312d411e1334d71d02ac61ed76a47d0ef228532fe715ddffb568998a1d449078cc8925cd37dd44f9b660efc15d56b
-EBUILD conan-2.0.0.ebuild 1598 BLAKE2B 7af4a03a0652b56c1fb3d3c8e3fee2e767c7737ceb32969a7fca3021818515f671ddfa7eadc43b41bc4d82791725fd814fce274d508c652a34ef58c75d3b112f SHA512 2eb6880f070be2e96d158d24a0af74a28961752ac6ad0f739d2481a2ecafb5da30cd35620d966c2eb11a257f36058d3afd31f29d8f065be5f32e8d464b089483
+DIST conan-2.0.4.gh.tar.gz 918671 BLAKE2B 7a3d4f39b9e7f44a44fe498900c41657e8a9a7c3e700fbbdaa547b3679caf98627152e29fe50f272148184bd5ad8edcc7b0f79029c4728a3ef9f0128c5e31db6 SHA512 ff59b7dc6c0b4c33c09a338429054c2f9087e8b7147b21521f235263d0fca17ed69dc780cc0c65ed64fc8f67c5511362297e4252e1ca6046f872b91436d23908
+EBUILD conan-2.0.4.ebuild 1606 BLAKE2B 835cbd93fe37b1477552ab4c21d12d6b794a99964f3a5434a92de28480b9e86c54ce6e8d4d86bfce7a9f7e820537dadcd8b030a34e0dc5fb7cdd958479522c21 SHA512 5e542194dbf11a3ffb6ebdc0cb72e0e0ca55b509b75537c13d5660e5e644d9013a4fe758c5ebba7274df4295b1e643fab5b3a1eb20c30015158c4be9a88fb8a2
 MISC metadata.xml 770 BLAKE2B a6449d035d354804266fda862537f1005e4fff043bc5e8d28245392d7c7281e87cffb68029a5f8c941c2757f7343897eeeb8121376ec4b752d0451ca540c7ad8 SHA512 9666ab3361098a48ada5370ab5d897e9b1fabbea50d5eb141895ae8c7ef537317f087735f0924482b1248d3c6558dcd33cc65f4c085b029541f4d5c6144a8be8
diff --git a/dev-util/conan/conan-1.59.0.ebuild b/dev-util/conan/conan-1.59.0.ebuild
deleted file mode 100644
index 434460af9a91..000000000000
--- a/dev-util/conan/conan-1.59.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-DESCRIPTION="Distributed C/C++ package manager"
-HOMEPAGE="https://conan.io/"
-SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-# overly strict requirements?
-# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
-# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt
-RDEPEND="
-	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
-	>=dev-python/node-semver-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
-	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.6[${PYTHON_USEDEP}]
-"
-
-# Try to fix it if you're brave enough
-# Conan requires noumerous external toolchain dependencies with restricted
-# versions and cannot be managable outside of a pure CI environment.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}_nodesemver.patch"
-)
-
-src_prepare() {
-	default
-	# Fix strict dependencies
-	sed -i \
-		-e 's:,[[:space:]]\?<=\?[[:space:]]\?[[:digit:]|.]*::g' \
-		-e 's:==:>=:g' \
-		conans/requirements{,_server}.txt || die
-}
diff --git a/dev-util/conan/conan-2.0.0.ebuild b/dev-util/conan/conan-2.0.4.ebuild
index 17b10fd6095d..d44a558d8cec 100644
--- a/dev-util/conan/conan-2.0.0.ebuild
+++ b/dev-util/conan/conan-2.0.4.ebuild
@@ -18,8 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 # overly strict requirements?
-# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
-# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt
+# https://github.com/conan-io/conan/blob/release/2.0/conans/requirements.txt
+# https://github.com/conan-io/conan/blob/release/2.0/conans/requirements_server.txt
 RDEPEND="
 	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
diff --git a/dev-util/conan/files/conan-1.59.0_nodesemver.patch b/dev-util/conan/files/conan-1.59.0_nodesemver.patch
deleted file mode 100644
index 4c914af6a63c..000000000000
--- a/dev-util/conan/files/conan-1.59.0_nodesemver.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/conans/client/conf/required_version.py b/conans/client/conf/required_version.py
-index f06342d66..f1f62d3c7 100644
---- a/conans/client/conf/required_version.py
-+++ b/conans/client/conf/required_version.py
-@@ -1,7 +1,7 @@
- import six
- 
- from conans.client.cache.cache import ClientCache
--from semver import satisfies
-+from nodesemver import satisfies
- from conans import __version__ as client_version
- from conans.errors import ConanException
- 
-diff --git a/conans/client/graph/range_resolver.py b/conans/client/graph/range_resolver.py
-index 616585967..856fb25da 100644
---- a/conans/client/graph/range_resolver.py
-+++ b/conans/client/graph/range_resolver.py
-@@ -56,7 +56,7 @@ def satisfying(list_versions, versionexpr, result):
-     if some version cannot be converted to loose SemVer, it is discarded with a msg
-     This provides some workaround for failing comparisons like "2.1" not matching "<=2.1"
-     """
--    from semver import SemVer, Range, max_satisfying
-+    from nodesemver import SemVer, Range, max_satisfying
-     version_range, loose, include_prerelease = _parse_versionexpr(versionexpr, result)
- 
-     # Check version range expression
-diff --git a/conans/client/tools/version.py b/conans/client/tools/version.py
-index c6518302c..4c2206124 100644
---- a/conans/client/tools/version.py
-+++ b/conans/client/tools/version.py
-@@ -2,7 +2,7 @@
- 
- from functools import total_ordering
- 
--from semver import SemVer
-+from nodesemver import SemVer
- 
- from conans.errors import ConanException
- 
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 74bca5ef314e..077428f1550c 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -3,6 +3,8 @@ AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
 DIST intel-graphics-compiler-1.0.13463.1.tar.gz 8283903 BLAKE2B abe9f2a8cc0c648d985890d65782db2df61966d25b740ee735b0198cee701e79fcd33267b8284002f049cc2582db13c3b33481131570c0d69435a3dc4ada64d4 SHA512 3edafc7cadb946b62b5afa44bf81663c83ad6eab15c2825b60cfb5120da94d66898d3f073af13a747cdf2db586085de14ee75fcdda0e16a1ca7197d5645fe1a9
 DIST intel-graphics-compiler-1.0.13822.1.tar.gz 8356125 BLAKE2B 248bbf34031059506b6e41a07bb3ef0d849f388b660488345d0e21594994f7faa8d498d8f60ba0298c82f7cdf66839bc25bd9bb5856ab273b02fb415e9801176 SHA512 c0705b86955fe6cd38f4756bdd5029ff6ed62305d58b99184d85261b0ed0d9699a176fe414bbafb5e987b831d13d0e6709b1e83a442519500c7d66c049386baa
-EBUILD intel-graphics-compiler-1.0.13463.1.ebuild 2518 BLAKE2B 832fbeddffb0b3f9610772b6d79f37479b8d6a927a32241d42c6a27f5054f32d2668f2cfac90a3833efc7e84807e350f2b70af682e11cb55d9bda1abf9ef86b5 SHA512 f605a5cb37772bebf8d40519608066a48bae3eb3a920be953f5fc721ff1c5f62f3e6d95090db55e9df4a65e272ee566ce150755ae38ffeed8c448167dffc82d4
-EBUILD intel-graphics-compiler-1.0.13822.1.ebuild 2519 BLAKE2B c323208d37fe7d77b5562ba9e449db3c1a5104a471c6dc02905e9cd9c5acc3293da9fc9b81175518216265be68a29ed82b178039161e946d3d805c2136b172b8 SHA512 97a7851ff771d94424a26ef91a0ca87ae34be731a10c91db39b9d5d6f9aa569ca045d0e9255bc7cc14286e0dd1df462c90ac362eec2041beb735b5572360ec43
+DIST intel-graphics-compiler-1.0.13860.4.tar.gz 8369568 BLAKE2B cb36943d83dfa0b69e8dc0840de527773262e15f617a67f231071e56bfef67a27783914e947681c6d64f68fcc2caed9a45893cbe1b206a98a311f5699f3769ae SHA512 365221df9178d45cd2f80cacf1f72a61208ce5cb7103e6298ec560675b1c1bf4caf9b8ae4cf8b332179118d1aacc735bd7341a126f6149ef49ae91d37ce98fef
+EBUILD intel-graphics-compiler-1.0.13463.1-r1.ebuild 2520 BLAKE2B b3624947dbf9d739deec224e713bcf965626eb0b3a1952923c2aac61a2c625faa7e44a3cc226c778caab199e8272251efae6d5e7396b03406935dbd29756e138 SHA512 e47b69d1d02a04be5b5d797573b495fbdd4ea36988817dd962316661aa8de60c448427f131cac1a3954d5233d465e5a6a8dbd3bb9a164b54864e0b9a5a9c6bbb
+EBUILD intel-graphics-compiler-1.0.13822.1-r1.ebuild 2521 BLAKE2B 12988dedc39ac66d70e2f1ab90c001782b1e89f1e39aa0a58b865e18f4a418aa4fd99d7073cdf3559ae0482469764bb68565e5235817ab1cc49a32eb7d2c61f7 SHA512 cb90cb5bc92fddfe4b3b8f62fb6582d3ce8082d3d1bbbb8557c8c2f5f4a0e09cd46bd5a7f7bffa484f42c4dd35341a5b3c31e9e7441f956b44097e7acbd0b3f8
+EBUILD intel-graphics-compiler-1.0.13860.4.ebuild 2656 BLAKE2B a26196812dcabd83f20ed02c28b42e004f6d69ec5a4504f560ed9cbcd9e3487ea8b7b0e752fbed4fa6a77924b0abd34a574aff8d242de42251e7cdd965bd2f8c SHA512 96c9cbd9b805582983fa940b5d1a6369c8f33285889529232c8cb5bac99bbb8b505a3f285d6085603ad4cceece753eba23ecff849911b96735f9459d6e5f62d0
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13463.1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13463.1-r1.ebuild
index ba5b51cad315..334eb883c931 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13463.1.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13463.1-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	sys-devel/lld:${LLVM_MAX_SLOT}=
 	sys-devel/llvm:${LLVM_MAX_SLOT}=
 	vc? (
-		>=dev-libs/intel-vc-intrinsics-0.11.0
+		<dev-libs/intel-vc-intrinsics-0.12.1-r1
 		dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
 	)
 "
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13822.1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13822.1-r1.ebuild
index 7715b2c3fbdd..2c51f6697d84 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13822.1.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13822.1-r1.ebuild
@@ -27,7 +27,7 @@ DEPEND="
 	sys-devel/lld:${LLVM_MAX_SLOT}=
 	sys-devel/llvm:${LLVM_MAX_SLOT}=
 	vc? (
-		>=dev-libs/intel-vc-intrinsics-0.11.0
+		<dev-libs/intel-vc-intrinsics-0.12.1-r1
 		dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
 	)
 "
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13860.4.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13860.4.ebuild
new file mode 100644
index 000000000000..c769cc3420fd
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13860.4.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LLVM_MAX_SLOT="15"
+MY_PN="igc"
+MY_P="${MY_PN}-${PV}"
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake flag-o-matic llvm python-any-r1
+
+DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
+HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
+SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug vc"
+
+DEPEND="
+	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
+	dev-util/spirv-tools
+	sys-devel/lld:${LLVM_MAX_SLOT}=
+	sys-devel/llvm:${LLVM_MAX_SLOT}=
+	vc? (
+		>=dev-libs/intel-vc-intrinsics-0.12.1-r1
+		dev-util/spirv-llvm-translator:${LLVM_MAX_SLOT}=
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="
+	=sys-devel/lld-${LLVM_MAX_SLOT}*
+	${PYTHON_DEPS}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
+	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
+	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
+)
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Don't hardcode FORTIFY_SOURCE
+	sed -e '/-D_FORTIFY_SOURCE=2/d' -i IGC/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# Get LLVM version
+	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
+	local llvm_version="${llvm_version%%-r*}"
+
+	# See https://github.com/intel/intel-graphics-compiler/issues/212
+	append-ldflags -Wl,-z,undefs
+
+	# See bug #893370 and https://github.com/intel/intel-graphics-compiler/issues/282
+	append-flags -U_GLIBCXX_ASSERTIONS
+
+	# See https://bugs.gentoo.org/718824
+	! use debug && append-cppflags -DNDEBUG
+
+	local mycmakeargs=(
+		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
+		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
+		-DIGC_BUILD__VC_ENABLED="$(usex vc)"
+		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
+		-DIGC_OPTION__CLANG_MODE="Prebuilds"
+		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
+		-DIGC_OPTION__LLD_MODE="Prebuilds"
+		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
+		-DIGC_OPTION__LLVM_MODE="Prebuilds"
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
+		-DIGC_OPTION__OPENCL_HEADER_PATH="/usr/lib/clang/${llvm_version##*-}/include/opencl-c.h"
+		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
+		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
+		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
+		-DINSTALL_GENX_IR="ON"
+		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
+		-Wno-dev
+	)
+
+	cmake_src_configure
+}