gentoo auto-resync : 08:03:2023 - 18:00:26

7 files changed, 144 insertions, 4 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9c9021f92e37..2d071bd2d284 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index 442d93f2a1a3..1406922769ef 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,4 +1,6 @@
 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
 MISC metadata.xml 770 BLAKE2B a6449d035d354804266fda862537f1005e4fff043bc5e8d28245392d7c7281e87cffb68029a5f8c941c2757f7343897eeeb8121376ec4b752d0451ca540c7ad8 SHA512 9666ab3361098a48ada5370ab5d897e9b1fabbea50d5eb141895ae8c7ef537317f087735f0924482b1248d3c6558dcd33cc65f4c085b029541f4d5c6144a8be8
diff --git a/dev-util/conan/conan-2.0.0.ebuild b/dev-util/conan/conan-2.0.0.ebuild
new file mode 100644
index 000000000000..17b10fd6095d
--- /dev/null
+++ b/dev-util/conan/conan-2.0.0.ebuild
@@ -0,0 +1,50 @@
+# 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..11} )
+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.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
+	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.25[${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"
+
+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/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index b20cffd34b0f..17195dfb801e 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -6,7 +6,9 @@ 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.12812.26.tar.gz 8796229 BLAKE2B 8880f0efa47ea90de403c32a9a66fe0f2d1cd6b71b2c57ea38d01f2836892dc36e4e859b19def015f22eb0415be2ff8999a49256830059499b0ae654482cd21f SHA512 13a9f57cf744c38145e2b3d45099a6d54b6d792780dc3a2ab352484975c899f1a5c4f6072c96e786ce3bdf4690bdcf04cecebcf56f9bef4409e3cc3f27ec8458
 DIST intel-graphics-compiler-1.0.13230.7.tar.gz 8813719 BLAKE2B 5cc6ef816b030d786dfcf6296b39f6c2bfcc9db4c4a12db84456a508bd7d8998d4dfc9e6993e05167a3f797287176dda31e5fd43bbc3284fa26d4c8ca89f6164 SHA512 774f62ff8f5b7bd95fd766c88bc62ff66498c23d020dbfdfd18734e532e7d701652325cb7aca00f7ab3cfdd051d37e56939d7978db127e9044cd5b6c077979ac
+DIST intel-graphics-compiler-1.0.13463.1.tar.gz 8283903 BLAKE2B abe9f2a8cc0c648d985890d65782db2df61966d25b740ee735b0198cee701e79fcd33267b8284002f049cc2582db13c3b33481131570c0d69435a3dc4ada64d4 SHA512 3edafc7cadb946b62b5afa44bf81663c83ad6eab15c2825b60cfb5120da94d66898d3f073af13a747cdf2db586085de14ee75fcdda0e16a1ca7197d5645fe1a9
 EBUILD intel-graphics-compiler-1.0.12812.26-r2.ebuild 2665 BLAKE2B 1cfab463d3d85540a814ccd63840eb72a0d4ddfb25d7331f9d85288a7564eb0c97483b6b257fae3507cba63bf3b790dd8abd25f9d203ee4083e6acfac3bb3f17 SHA512 b2e7ff167846caa8a413f8994076ce3fd919e75495fd037fb915473267007995846f6a0e43119aa40b5cad422436bc25f88817244250af0f46deccee7b6e7ba7
-EBUILD intel-graphics-compiler-1.0.13230.7-r1.ebuild 2663 BLAKE2B 718d7f6da92e875e11d42caa5e2a4a804e1d251ff8922b2c0642fb0b8c6b743ffea56dfc478eb0f329c133cc424a07445ef77a44e8e7ca025042b3c2ae033201 SHA512 a2faefd952486545ba6ff205c5df6aafc20a9d24fbe8e357fd10c4a6fc4fa74bc835f08d4302cc596da97cc13c04bcf19f252bbcd10f7fdbbf8329b9b320bd22
-EBUILD intel-graphics-compiler-1.0.13230.7.ebuild 2543 BLAKE2B 97ab198c044ba103224f22d579fe2f937723aa929b0ca87d58f78c73e3df536e1f9184153d3fc1deca42130c798ae0039e5657ec7d8cdd7e17e788da06bfe8c4 SHA512 6088e6c373738ce726590c2f6b508139484b7be3e0eb891f6229f07754c7f3b070f25390f5fbca6fba732a956b51ff874a5e6177e1712dfaffb2a2c537dddb25
+EBUILD intel-graphics-compiler-1.0.13230.7-r1.ebuild 2611 BLAKE2B 383939aff80f9ada7dbad98b809a9f803b60e9294276e7a5849c9d455270f1ba0ed7815410e60391e106e1a02315d6c80a3294925c6dfaf76bf72978aad856e4 SHA512 867b4965e647945a1971f60bf30f3079963456e43456e1568b9d624b533c439fe268d9c8e8ac6fccfc5276f396400b5dec56d9c6d838f6e0380b306699c61955
+EBUILD intel-graphics-compiler-1.0.13230.7.ebuild 2491 BLAKE2B 320c3a1441fc17d2f892590cc6a1f056ba128ac145b8e6a66b862343609f62759d3bdefcbf30546559ad249e17bcf090d05f2c22c63bd297b94654cbc29850b6 SHA512 ab5495208cafddf8aac6a59d4fff3ab04d95269fcc559282b8252a47632f02a64049189386e8fca2055fcc547527fb1bcbe051838241a7d47890f5413dd26cce
+EBUILD intel-graphics-compiler-1.0.13463.1.ebuild 2519 BLAKE2B c323208d37fe7d77b5562ba9e449db3c1a5104a471c6dc02905e9cd9c5acc3293da9fc9b81175518216265be68a29ed82b178039161e946d3d805c2136b172b8 SHA512 97a7851ff771d94424a26ef91a0ca87ae34be731a10c91db39b9d5d6f9aa569ca045d0e9255bc7cc14286e0dd1df462c90ac362eec2041beb735b5572360ec43
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild
index b6627fa95adc..0b880385e6e5 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7-r1.ebuild
@@ -80,7 +80,6 @@ src_configure() {
 		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
 		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
 		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
-		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
 		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
 		-DINSTALL_GENX_IR="ON"
 		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7.ebuild
index 4a48c5cff382..8125e1bf6e81 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13230.7.ebuild
@@ -77,7 +77,6 @@ src_configure() {
 		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
 		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
 		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
-		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
 		$(usex vc '-DIGC_OPTION__VC_INTRINSICS_MODE=Prebuilds' '')
 		-DINSTALL_GENX_IR="ON"
 		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
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.ebuild
new file mode 100644
index 000000000000..7715b2c3fbdd
--- /dev/null
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.13463.1.ebuild
@@ -0,0 +1,88 @@
+# 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="14"
+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.11.0
+		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_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
+}