gentoo auto-resync : 03:11:2024 - 03:04:03HEADmaster

8 files changed, 18 insertions, 115 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index c4e042ffb63a..7022e47bf900 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 0002b0eeff78..4a178817f877 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,8 +1,6 @@
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.17537.20.tar.gz 10494922 BLAKE2B 49339d6826968518506004f0f9fdb314e8ec595029a40ee94cea34b9e3c94907c1130e2aaed65c68e35fd598e080eeb9b910933c04529b3e04dfc8db5e0a8cab SHA512 ee4c20b2b800f86718f76a09aebc891327877db1d81f9d1f8a9e22203a47437665ed7790eced4ca66e7c47b9d93cb0da9db03a4216f38093981a8ee0395163cc
 DIST intel-graphics-compiler-1.0.17657.8.tar.gz 10690533 BLAKE2B e1b3dc3fbd1515abb030c1da791cdc91d83648cfd1a9f8dce8ed087cefdd30a4413b6b534bb67902424c8ee67e84c7d85283cf548fb6ecd413e13639f883d0c3 SHA512 3dd0a6e5aa80ea0cad3608a6940cb563fcfce72e33b2284634903319ec984d6659f6a8ea51d31dfd35b1f3ebf6b89e78c5524d3f10735f52c09f52d13ea42e7a
-EBUILD intel-graphics-compiler-1.0.17537.20.ebuild 2952 BLAKE2B 9d15fda922d437ce90ea878d30293e02167c0875bdf6c860853bb6039237eab581b4d28757b277ee2d2d2d64227316f0d818d2d7f009e1842377f9d602d3f18b SHA512 0b11a2b4682bfc409e50c48c705d05d92beadbfc23c593e6270937b7bda18a71795e2db554ca04ba8bf1e7ae823aec74c939fd228892e05bb9d3a16ea0dd9045
-EBUILD intel-graphics-compiler-1.0.17657.8.ebuild 2953 BLAKE2B 039715072bdaff064ed696429e8bac38726690b775e39929bc4e9ed554c864fa31de15fc795b123fd95d745c710b63d10404306d5b661e712572e3bf85b32b3f SHA512 bbc087ec2170a015d7493b99de3646c862fba00d4013d473aeca56e668f8f55466206b1489d7e392fe43ef067b09758613bfc2eb2beff7e870b0b124272e43af
+EBUILD intel-graphics-compiler-1.0.17657.8.ebuild 2952 BLAKE2B 9d15fda922d437ce90ea878d30293e02167c0875bdf6c860853bb6039237eab581b4d28757b277ee2d2d2d64227316f0d818d2d7f009e1842377f9d602d3f18b SHA512 0b11a2b4682bfc409e50c48c705d05d92beadbfc23c593e6270937b7bda18a71795e2db554ca04ba8bf1e7ae823aec74c939fd228892e05bb9d3a16ea0dd9045
 MISC metadata.xml 682 BLAKE2B c5e74bbb1a5aca5eed7cb75a19820dc9d78d7ef7a15687924d16863a82a535403ca67103ac458d4b86f380244e726a3bd20fb496f8048f999abdf89950a7092c SHA512 d5a35d2104e9aa5caaf903a9f61ca8a8c4f8b5bff3e993c9964dd63196e64b88e3e7bde2e0cff9dcee9c66bdda0cabb43c5ac8c121796626bb0e7f4013929fb3
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17537.20.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17537.20.ebuild
deleted file mode 100644
index 468f31f095cb..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17537.20.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_COMPAT=( 15 )
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit cmake flag-o-matic llvm-r1 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:15[${LLVM_USEDEP}]
-	dev-util/spirv-tools
-	$(llvm_gen_dep '
-		sys-devel/lld:${LLVM_SLOT}
-		sys-devel/llvm:${LLVM_SLOT}
-	')
-	vc? (
-		>=dev-libs/intel-vc-intrinsics-0.19.0[${LLVM_USEDEP}]
-		dev-util/spirv-llvm-translator:15=
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]')
-	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
-	$(llvm_gen_dep 'sys-devel/lld:${LLVM_SLOT}')
-	${PYTHON_DEPS}
-"
-
-python_check_deps() {
-	python_has_version "dev-python/mako[${PYTHON_USEDEP}]"
-	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-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-r1_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_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_SLOT}"
-		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix)/$(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' '')
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DINSTALL_GENX_IR="ON"
-		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_SLOT}/include/LLVMSPIRVLib"
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17657.8.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17657.8.ebuild
index 32d1a163115a..468f31f095cb 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17657.8.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.17657.8.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug vc"
 
 DEPEND="
diff --git a/dev-util/memprof/Manifest b/dev-util/memprof/Manifest
index 5e669128eaf5..823406b756a4 100644
--- a/dev-util/memprof/Manifest
+++ b/dev-util/memprof/Manifest
@@ -3,5 +3,5 @@ AUX memprof-0.6.2-desktop.patch 758 BLAKE2B d600c34b5a7cef6536a5dbb4a5feb75b2344
 AUX memprof-0.6.2-gcc14-build-fix.patch 733 BLAKE2B ce0f96cf7611afb25370a4cc7fcde53e6cf10b2010eeabf87ac49549a85068681f3f976af6ad18bff95d698f680b8d79476b50bac2e16aa2acabddd7d3e14661 SHA512 a05cadf69fee3f6e5e9bcfe875e5f323a3d60222a587bd33c2b73376a8164a2b27960305d06e16309187f3be76945de478e6942ff15070687f4393470a05967a
 DIST memprof-0.6.2.tar.gz 534543 BLAKE2B bc4b98d13ac2a789540006c69b185c95ab9a8c059250e53d89e3baed8d80cffc506ab27e081fbab914390d77c4e67371f2632363a90e3a8d804799b00b5bb208 SHA512 cecfeb88f10f11fc4df106367871487453ddd9cb502ef96a6f120ee8889cfa96e8463f260c853abb351c7864e68904cf6e833864d561f9e7b09a785f4c315ca7
 EBUILD memprof-0.6.2-r1.ebuild 815 BLAKE2B f34a215f49bc613e6e8760b8dfc4ed9ae3158458ffd639ca3a0a0ec00663fe7cb32049f48212ce0a8d7cf33c930510e21e127eb9a5908fea3df816a1bc1b5dd2 SHA512 24bc293ebe172e9151cff8a78f82cced938b3f1b0a9f7e677ab6cb5835721b6ee5625680b863b7f230fba592bc1eb2230f401e72c5e74f377be4b6284c69be52
-EBUILD memprof-0.6.2-r2.ebuild 793 BLAKE2B de7293979943f1f4a208448d4d2fbd31716045bdf69aef10e341761c8ed20ee467a2913b42d67308c1c7a33f2c4f22624288158c125c48417594cdbeda8d3362 SHA512 582a62c90c678c6aed28b93cb8e716cc081efd1d99d7ec7298b392b464cdb71ea2a470cfb3856272c3470ee9246e9625f7641acd1d00120a678c43772edbfdd5
+EBUILD memprof-0.6.2-r2.ebuild 792 BLAKE2B 0984428e2b5d199363f7a98fffa4609cdc7b31b215350a9a1f0ba54c09b663a104952a27ea61f6d2e2eb42d7a0df582ad57ae9b79669ef29b04575158792756a SHA512 f05a90442cef43b22a2ad4aa5a4c26bb4b04b477b81efb65f3bdd120e2c68b931d13550b3e80f7aae42a24e7b7b22436799f0e89ecdee0fec03f3fc07ebf2466
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-util/memprof/memprof-0.6.2-r2.ebuild b/dev-util/memprof/memprof-0.6.2-r2.ebuild
index 86aecfb96213..a2f53190f4d8 100644
--- a/dev-util/memprof/memprof-0.6.2-r2.ebuild
+++ b/dev-util/memprof/memprof-0.6.2-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.secretlabs.de/projects/memprof/releases/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/dev-util/smem/Manifest b/dev-util/smem/Manifest
index f7df071eee1c..4a3d860045a8 100644
--- a/dev-util/smem/Manifest
+++ b/dev-util/smem/Manifest
@@ -1,3 +1,3 @@
 DIST smem-1.5.tar.bz2 15443 BLAKE2B 31fc73b4e74c08a39957983fb02347ad18fae7a50aee8d8a259e15436911967c56e9ce14a4c89ccc3072d49d802c2b3268792992587170b795b7a08b1678d208 SHA512 bf21536294f1b84e3cc40cbed3077f30f5a1c911fd983cf6f7d7bd3f1bc6e3c4cc9ba509daa8da8f6a12ec2df63b25772a070d80cd45ee289a0725565c89a344
-EBUILD smem-1.5-r2.ebuild 840 BLAKE2B 759b3b0aa7dcac63e5fe4a58868cc69ba9c06d2d59173a6e863bcb9e8f5d027aec29f43a65d4ec2e44ee3ea8aceb480247c44107f5b21179ff81229ada4bd15c SHA512 c52ed4e6eab1ed1b6c4b5f3a0e1b659489fb472c14ed420992c7445b4f57b46abd283b205727d6b7e42c9b598884e823631fe3cb3b840070765d989102f4ed87
+EBUILD smem-1.5-r3.ebuild 1061 BLAKE2B c716ae0a743430810e2e29a26b4be19c253409a9239dd4e3b9adafab38e5c072b9b14a3cdd4f432fa3a6da3a601d216411315f1288b8af4a06b8fcd455fd431e SHA512 e7c9c8b82762b55802f2bd329e4ca441f2b39a49c164bf3241254d22ccb6e196fa1fc8a7ce8ca4786e56c20107d569df18cf5217a7cb867e5644f0cd18b56c02
 MISC metadata.xml 888 BLAKE2B cf7c3b7dd389317f3035dd32227c8102db164e2c7320df7e28a9ef64463d97a6e2fba6c9ca1123654f14c6cc04a7bb8933c96513dac82552e317a3ccfdf432d6 SHA512 fdf5bda9de1dfc8dde3992c9d8c48c3665e243d56916c4a3903926b680e53d40fda0fcea5b27e9e6a040f06f1da5bed9c75b1d5133063fdf81d3ba6f359ff3e3
diff --git a/dev-util/smem/smem-1.5-r2.ebuild b/dev-util/smem/smem-1.5-r3.ebuild
index 9a16695d6697..664c48b3a584 100644
--- a/dev-util/smem/smem-1.5-r2.ebuild
+++ b/dev-util/smem/smem-1.5-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 EGIT_COMMIT="2ab5040d5633"
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
-inherit optfeature python-single-r1 toolchain-funcs
+inherit linux-info optfeature python-single-r1 toolchain-funcs
 
 DESCRIPTION="A tool that can give numerous reports on memory usage on Linux systems"
 HOMEPAGE="https://www.selenic.com/smem/"
@@ -21,6 +21,16 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}"
 BDEPEND="${RDEPEND}"
 
+pkg_setup() {
+	# CONFIG_PROC_PAGE_MONITOR is needed
+	if linux-info_get_any_version && linux_config_src_exists ; then
+		CONFIG_CHECK="PROC_PAGE_MONITOR"
+		check_extra_config
+	fi
+
+	python-single-r1_pkg_setup
+}
+
 src_compile() {
 	"$(tc-getCC)" ${CFLAGS} ${LDFLAGS} -o smemcap smemcap.c || die
 }