gentoo auto-resync : 21:08:2022 - 02:40:11

15 files changed, 47 insertions, 221 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 5d889d1a3b56..eeaafe678dfb 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest
index 303ff27d585c..9c0595365d71 100644
--- a/dev-libs/intel-compute-runtime/Manifest
+++ b/dev-libs/intel-compute-runtime/Manifest
@@ -1,14 +1,10 @@
 AUX intel-compute-runtime-22.24.23453-remove-fortify-sources.patch 1078 BLAKE2B 933cd6b5b3f9aefde4b416960151458eb7845f422e493ab40257330c88b55e1866cf0ff59338ec708d705750ca88c87d54014d51d9492c3dadba7525b523ab56 SHA512 ee831418acb9ba5deba95dc2e013119a0cfe7db533710108063dc67cd0a4030a4419bbad0a007fdab445eba14036fdcae26ea0b4ce675ebb20f402620b880de8
-DIST intel-compute-runtime-22.26.23599.tar.gz 5574368 BLAKE2B 6302ced3e75d7d31a55c20e0c08f915fc2d3df149a843115ce925c62b50e2c9b47fc61ea48ad45a52967703f3d9e31ff23cd4e61d1666e5cf072d7c84c0ef416 SHA512 1ce2b0e9d3886ab51636265c7e1a91bbe817e27995d8e2d96fc4b67633c89f11232005f18f81a462f76fa67d9298fce51a335b9c4545d8b461019cd9e487b4dc
-DIST intel-compute-runtime-22.27.23681.tar.gz 5593740 BLAKE2B 5d627623e7b0ec89aacb5dfee7442803254c233382a2b242f0f856d51256a60d614e6a3d88ec5c0d494ad25211adb5d75a13b5ff86739795e46aa50e7a9686e4 SHA512 1269126ff447f7c0e1ec9e33ef5245476afe44812a2b6ded86f6219ae61c74bf862a152a740684638b12cdcffce454af3a3be5b4b16c3b7f9c0e7b660b73701a
-DIST intel-compute-runtime-22.28.23726.tar.gz 5609087 BLAKE2B ec5b70090e58b08d63f006034d4326426f4caf42b681e32027da79876d019875540ed52cf048fe9919d54bcbac5911bac6ea8a228b8020b9e56d5a61bd1c3c2b SHA512 5e59c678a146eb995e6bcfcedb96c812e40d4561cd4725740742691fc79fd597f4c31659b08763376263ff6100a0f7960f4d5f05a35ff97bed2dc870df189c48
 DIST intel-compute-runtime-22.29.23750.tar.gz 5613298 BLAKE2B 7c662c85732d2053d64a68651484030a16aeae4bac3943c2891771c865c623912d4466dea8258caf7a150d34cc06e2f7e451fde831cc6023ebee4036d55207f0 SHA512 8f9b7f87a93585a0a71d2e5339ec64d01f150722051ca844c47db1803491b6c4d8a371e3332ce6c0e85c6e129711cdba210000176904e922577c3e6c42b791a2
 DIST intel-compute-runtime-22.30.23789.tar.gz 5625283 BLAKE2B 0a59926453ae8a58afbd49a40d8b94ac9171d23a141f967c6d908b26ab66decbd082d42fe6e75bf9fd2b4327cbe5b4c71f6ef390a8a62435c06b749078d67cd4 SHA512 8f2caee7376a9a489efc7ee5b907786d1fc04ed3143dfc66e28069f4d19c13393c64cf6ea0159ce269ee2198dadddd7ef967a11efac90e616ce1f1c996b07153
 DIST intel-compute-runtime-22.31.23852.tar.gz 5644386 BLAKE2B 90eb629187d0aba7a713c600234f18a5472d7ad4e9a7c1130e61011970a9247165f17dab936abb875ee4dd9b4ba167135d158a1b19fce9f20d2bd1c23c9d065b SHA512 66fae1c0e3173f45f0565906d455d4511d40bc392a966625f60315e6a72daa30c741dddc799c50b8e020092577af6aa03810cd5a5e3e729ab19815cdb5e6a27a
-EBUILD intel-compute-runtime-22.26.23599.ebuild 1968 BLAKE2B 207354c84dea0666197c05c8b078918f13fc2fd609408243bed40caf12b173e7a2f584d7f27c84733d84281a00dfdb30bd7782f5e2fd7adeb1a6217ae1963199 SHA512 c2bc587640240a51fc478c6ea9a963d0d38fc90768fa7258e0109e49a22e318280e89dd50b0b52aff2585553f01190c9fb47d2d164f7b874b2a4807e4463c7b5
-EBUILD intel-compute-runtime-22.27.23681.ebuild 1969 BLAKE2B 29374964a21a978e56c0df9cf4e2e8804dcef0c67bac97f6a0a72c2261e2b8b413606682025afc972287c72fa46180b936de9ee028e5f5a70322d750a371acc7 SHA512 7ca5c87ba4a6ec1b81873f32141816ff2e2ba1594a0b39c33264db3edb92af6df6d2f255d5157dc2101d05562ffca498c9310cbd2957c6f69e943449097678e6
-EBUILD intel-compute-runtime-22.28.23726-r1.ebuild 1983 BLAKE2B 51920862bbfd66903efdd6bad1ea586410addee13c23e787a9aadc29e17df5dd57518f10d70526a9889ac796db6810b27370663bee5e21f1540cce40e893ff9b SHA512 375b782db9028d65395b9141b640483eb38a486c6642c3262b829582ebfa4ff13601b4425e8915825fe54b6b0d1c52651ead6fd66cb7df563cdfa56ab050323b
-EBUILD intel-compute-runtime-22.29.23750-r1.ebuild 1983 BLAKE2B 3099d855a211d6893f216fec029f7aa78ca31460dedcfb19f1a1449549ad4ceae714b179b893a2b47b5d501dfa754cbb9d244a393cfccc5a0badffa069a2e423 SHA512 b24d315de1ddacb1a2999ec5f7e0971ab6313b5dd84a1ac5fefcf1827f5ccc054eb3a6ab10ca40d807445e13c981a0ad5269804523f3051d83bc5000f9f5245f
+DIST intel-compute-runtime-22.32.23937.tar.gz 5656306 BLAKE2B 82cc631b69d24d2b845d6c9abc0525f06de8314c7915e651db3c800527244c94104eea6083acdde194cc51f9a68bdfcd39f3f4d296c96338e9f05c05d71cc21c SHA512 729d29c09624ae81ca1e8a455d4e3665fcb31cac87e9776730c038a3393e91e1a00e2079e2587adf4b9ab1797179f49fafd48ac5b855dab722837f1f3b77e0f0
+EBUILD intel-compute-runtime-22.29.23750-r1.ebuild 1982 BLAKE2B 20c0fda1c683d65e213d3f492b392a1826cb6f3eeca283819edc68eccea16530812ab6d636dc876cd4d3f814c76bd51baa97f64c979e04a430f6e04478170842 SHA512 9216c791966c11977c4f9ab3d7a280158f620c28fefbd2e0ab8c4086bbc09d93f331e090bd2a6e64b7f6f1af1154c0f25279b32e82b6a6e02e09bddaf2d3ac94
 EBUILD intel-compute-runtime-22.30.23789.ebuild 1983 BLAKE2B 3099d855a211d6893f216fec029f7aa78ca31460dedcfb19f1a1449549ad4ceae714b179b893a2b47b5d501dfa754cbb9d244a393cfccc5a0badffa069a2e423 SHA512 b24d315de1ddacb1a2999ec5f7e0971ab6313b5dd84a1ac5fefcf1827f5ccc054eb3a6ab10ca40d807445e13c981a0ad5269804523f3051d83bc5000f9f5245f
 EBUILD intel-compute-runtime-22.31.23852.ebuild 1983 BLAKE2B 3099d855a211d6893f216fec029f7aa78ca31460dedcfb19f1a1449549ad4ceae714b179b893a2b47b5d501dfa754cbb9d244a393cfccc5a0badffa069a2e423 SHA512 b24d315de1ddacb1a2999ec5f7e0971ab6313b5dd84a1ac5fefcf1827f5ccc054eb3a6ab10ca40d807445e13c981a0ad5269804523f3051d83bc5000f9f5245f
+EBUILD intel-compute-runtime-22.32.23937.ebuild 1983 BLAKE2B 3099d855a211d6893f216fec029f7aa78ca31460dedcfb19f1a1449549ad4ceae714b179b893a2b47b5d501dfa754cbb9d244a393cfccc5a0badffa069a2e423 SHA512 b24d315de1ddacb1a2999ec5f7e0971ab6313b5dd84a1ac5fefcf1827f5ccc054eb3a6ab10ca40d807445e13c981a0ad5269804523f3051d83bc5000f9f5245f
 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.26.23599.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.26.23599.ebuild
deleted file mode 100644
index 81416e18f78f..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.26.23599.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+l0 +vaapi"
-
-RDEPEND=">=media-libs/gmmlib-22.0.2:="
-
-DEPEND="
-	${DEPEND}
-	dev-libs/intel-metrics-library:=
-	dev-libs/libnl:3
-	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-compiler-1.0.11061-r1
-	>=dev-util/intel-graphics-system-controller-0.2.4:=
-	media-libs/mesa
-	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.7.15 )
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		x11-libs/libva
-	)
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "README.md" "FAQ.md" )
-
-PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" )
-
-src_prepare() {
-	# Remove '-Werror' from default
-	sed -e '/Werror/d' -i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# See https://github.com/intel/compute-runtime/issues/531
-	filter-flags -flto=* -flto
-
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
-		-DBUILD_WITH_L0="$(usex l0)"
-		-DDISABLE_LIBVA="$(usex !vaapi)"
-		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
-		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
-		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
-		-DSUPPORT_DG1="ON"
-		-Wno-dev
-
-		# See https://github.com/intel/intel-graphics-compiler/issues/204
-		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DSKIP_UNIT_TESTS="1"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.27.23681.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.27.23681.ebuild
deleted file mode 100644
index 077189e165cf..000000000000
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.27.23681.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver"
-HOMEPAGE="https://github.com/intel/compute-runtime"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+l0 +vaapi"
-
-RDEPEND=">=media-libs/gmmlib-22.0.2:="
-
-DEPEND="
-	${DEPEND}
-	dev-libs/intel-metrics-library:=
-	dev-libs/libnl:3
-	dev-libs/libxml2:2
-	>=dev-util/intel-graphics-compiler-1.0.11061-r1
-	>=dev-util/intel-graphics-system-controller-0.2.4:=
-	media-libs/mesa
-	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.7.15 )
-	vaapi? (
-		x11-libs/libdrm[video_cards_intel]
-		x11-libs/libva
-	)
-"
-
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "README.md" "FAQ.md" )
-
-PATCHES=( "${FILESDIR}/${PN}-22.24.23453-remove-fortify-sources.patch" )
-
-src_prepare() {
-	# Remove '-Werror' from default
-	sed -e '/Werror/d' -i CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# See https://github.com/intel/compute-runtime/issues/531
-	filter-flags -flto=* -flto
-
-	local mycmakeargs=(
-		-DCCACHE_ALLOWED="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_INSTALL_LIBDIR="$(get_libdir)"
-		-DBUILD_WITH_L0="$(usex l0)"
-		-DDISABLE_LIBVA="$(usex !vaapi)"
-		-DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include"
-		-DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include"
-		-DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors"
-		-DSUPPORT_DG1="ON"
-		-Wno-dev
-
-		# See https://github.com/intel/intel-graphics-compiler/issues/204
-		# -DNEO_DISABLE_BUILTINS_COMPILATION="ON"
-
-		# If enabled, tests are automatically run during
-		# the compile phase and we cannot run them because
-		# they require permissions to access the hardware.
-		-DSKIP_UNIT_TESTS="1"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.29.23750-r1.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.29.23750-r1.ebuild
index af9f16456a1e..6786aa838eae 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.29.23750-r1.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.29.23750-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+l0 +vaapi"
 
 RDEPEND=">=media-libs/gmmlib-22.1.7:="
diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.28.23726-r1.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.32.23937.ebuild
index bdc0a33ff5a4..af9f16456a1e 100644
--- a/dev-libs/intel-compute-runtime/intel-compute-runtime-22.28.23726-r1.ebuild
+++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-22.32.23937.ebuild
@@ -30,7 +30,7 @@ DEPEND="
 	>=dev-util/intel-graphics-system-controller-0.8.0:=
 	media-libs/mesa
 	>=virtual/opencl-3
-	l0? ( >=dev-libs/level-zero-1.8.1:= )
+	l0? ( >=dev-libs/level-zero-1.8.5:= )
 	vaapi? (
 		x11-libs/libdrm[video_cards_intel]
 		x11-libs/libva
diff --git a/dev-libs/intel-metrics-library/Manifest b/dev-libs/intel-metrics-library/Manifest
index 28c665207bbf..ca98222ecae2 100644
--- a/dev-libs/intel-metrics-library/Manifest
+++ b/dev-libs/intel-metrics-library/Manifest
@@ -1,5 +1,3 @@
-DIST intel-metrics-library-0_pre20220512.tar.gz 252101 BLAKE2B 32078b86a878a2650a812bc5a0d75f423e7fc05505e5ef2f9fbe6676126a78a67af4abe27451df323ea2699d363bcb7a7666d8b642214f36ecbea81b18f5b611 SHA512 3b05f6ea17b50b8357a579e4cc39ca6b920aa47d0b6bb9ca86b773c5ecf1532fd630ee738ff2f0c263d8ced4084023f7696ce848b0ecdb5aff00e6d8f393fa4f
 DIST intel-metrics-library-0_pre20220526.tar.gz 248259 BLAKE2B 6ecc5f9f0856ff24101c0591c7ec5174b3050b91517f5916394b3d1ad17cb2e03fecc90f3ed9be1ab490959043d545d0b161976d1c16a78cfd521d9c471aaa23 SHA512 f4f614a99987e4f3cae28bec5177485c4e91323d6bbf0a030ff1e84f3a7d34cdef1e3aace1819816e5414abf212320e2f1e05d3c770a59f2b9aa38b3e2b839d2
-EBUILD intel-metrics-library-0_pre20220512.ebuild 619 BLAKE2B 4abc1966e3c3119caf6064412611b464c0bd064492c34c682fe15f221b0f1a928adafe17d7ef11ebfdaa21349745467fc51e7cb8e2ca5eec44bc7add0cefa9ee SHA512 bf75afb6f98545980a1446a86bb511feb32a572cfef84292436dc145f11bd1261707c2910e7dd0c4e57e26499b258ec7bd4ad0675f05d67ec77383da823a9210
-EBUILD intel-metrics-library-0_pre20220526.ebuild 624 BLAKE2B ac305923667c08cab4268741d95e8c88ad807e94f610b536c7ac5dbd57bf9a2a1a10b55cfeb2cda7e35275c01e231f133e1850f60193b3555a9dfa6fa5cd8f30 SHA512 a65ad241c797756f1a349e8f87beb74738883413abda79598daccc5c191de13e7b56216bf69287531d14428bf7740ad26c21ab01d7abce0d941b2595767622a7
+EBUILD intel-metrics-library-0_pre20220526.ebuild 623 BLAKE2B ac283090d72c2cfbe80a9aef69794a910722f80cdc9cf038e98788bcd99e29e0514d8901dff991f27229651795f0794bbad254641d806255311b341548edeaf2 SHA512 29cad9e4b0241ed8757b3bffa24a47b3c88d31890b00b6cca1e6381cb62bff3f1251355b55cccf8b851955137f4e9f778e3db9ba96fec105cf5fdb2723a20b2b
 MISC metadata.xml 904 BLAKE2B 9b29e523b88f3d4eef193b4ecd90f03bf74d4e8521d3691bcc3518fc4133e4a97142b2d0f9a1354d86ea913ca79fa74972e99fe63a21eee7bb0fee78dd414e25 SHA512 ea9cd435e8b72549945ca370d318a84d03d8330ea995f726aa29f6c6a8fb1f353c9b5c2eab2fc56a2e89ffa6beb019be2a291f3f64d7a8e5782efc0c3935cebd
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220512.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220512.ebuild
deleted file mode 100644
index 11cb3589d4fc..000000000000
--- a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220512.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-EGIT_COMMIT="7d97bb29c4db1d79702402f8331d9be371a87f83"
-MY_PN="${PN/intel-/}"
-MY_P="${MY_PN}-${PV}"
-
-inherit cmake
-
-DESCRIPTION="A user mode driver helper library that provides access to GPU performance counters"
-HOMEPAGE="https://github.com/intel/metrics-library"
-SRC_URI="https://github.com/intel/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-DEPEND="x11-libs/libdrm"
-RDEPEND="${DEPEND}"
diff --git a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220526.ebuild b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220526.ebuild
index ebd35d2a810a..2ed1852b32af 100644
--- a/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220526.ebuild
+++ b/dev-libs/intel-metrics-library/intel-metrics-library-0_pre20220526.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${EGIT_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0/101"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="x11-libs/libdrm"
 RDEPEND="${DEPEND}"
diff --git a/dev-libs/level-zero/Manifest b/dev-libs/level-zero/Manifest
index 9561b25c8aa9..3e86c2438ccd 100644
--- a/dev-libs/level-zero/Manifest
+++ b/dev-libs/level-zero/Manifest
@@ -1,5 +1,3 @@
-DIST level-zero-1.8.1.tar.gz 419208 BLAKE2B 0957e1694db80f655dddfae06f13224ec21ed5ee349fe032e3c8fc643a72128c81f9a8dc9f040ad04eb91bc43491f7aa61d6c438276feb05c5e3099e8f18d66d SHA512 b108ed9a8be77924891b543c5b36c50ade7e7e17a9319c9e7b46526c6d4ee1d10397095a3e9ac4b95c14bfb224eb3b608a8e4b4e23740cec217326b203db4136
 DIST level-zero-1.8.5.tar.gz 694514 BLAKE2B ba0a247f07662bca58938600980196a03cc1f5588cbd80b6797a595e6781d7e23ca80d9256530625c1c07317e26cc799b06e4b66433496e5c61da4c45f814958 SHA512 42fde1f57ac86857563573e5367e68640b8e864704d779c3b337fab80d9f9ed85a6f6ca71700e87da92afbc4560eae73a6552a38b8a90f1e8cf039cf5937ae4b
-EBUILD level-zero-1.8.1.ebuild 627 BLAKE2B aca47fb72cf707848e75b93925d2026623612743ef8516f7d813143423a3b1a0bc7487edd309a583135e30a2c5dcfbd0f5fd388f94489e1963caf86cc899f6a5 SHA512 a3ebecbe6443a186d1b32edae090b0f97ff442f2aae1f22df0f23846b6dc583c7b893a9e4499cb8da756c83af65c15c712f200d129b59856dcaf8ed62e6035ca
-EBUILD level-zero-1.8.5.ebuild 634 BLAKE2B cf05903f0960299728389a5d0ee4a785a142864c9842977bfcb2876a6d384f407f955ae9e284f0c984dc0fcd68268073aa248db592fb62a9e0b688eaf7d99580 SHA512 cb3c25d0b924dfb0b14df2ac06a85b72dc588ba90014ccc0aff7671703a0784a90e870384a31b81b977207c8c9a72f573bbee466ec29e948e1a37c9d4ce4147c
+EBUILD level-zero-1.8.5.ebuild 633 BLAKE2B db2abed915bb21a15585d375da4e5c95551ba19759aaba35d0a00c166dc44ab40ef277750c1f686ab254e561d38b96caa989530db6be975bd7509598315fa083 SHA512 f6f54a8436af8885fc2020785930dc2ce59dd381ae1677f45a472f5fdb9ef80d53d34d17aaa2fddad1539754a86b30711a691a44599f705484101b9495238df1
 MISC metadata.xml 586 BLAKE2B 44eca05640a9276ea9cbddccc0d199dc8c7297a3fbf5ad6b58693c406961efa2aabf99501faaace47ce6bb97736fe371533e89a5a700949b03db66359222b269 SHA512 da9b222b216ed217842f236eeb1991e31ec4f140d86c0a048e9e401a18018d90d6ad8d4f10edec8b71386687bc9481ebf9154a1190bf6969d4fab04bba20100e
diff --git a/dev-libs/level-zero/level-zero-1.8.1.ebuild b/dev-libs/level-zero/level-zero-1.8.1.ebuild
deleted file mode 100644
index af873cd942fa..000000000000
--- a/dev-libs/level-zero/level-zero-1.8.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="oneAPI Level Zero headers, loader and validation layer"
-HOMEPAGE="https://github.com/oneapi-src/level-zero"
-SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# According to upstream, release tarballs should contain this file but at least
-	# some of them do not. Fortunately it is trivial to make one ourselves.
-	echo "$(ver_cut 3)" > "${S}"/VERSION_PATCH || die
-}
diff --git a/dev-libs/level-zero/level-zero-1.8.5.ebuild b/dev-libs/level-zero/level-zero-1.8.5.ebuild
index e8f73f07eae2..e3c8edfb2762 100644
--- a/dev-libs/level-zero/level-zero-1.8.5.ebuild
+++ b/dev-libs/level-zero/level-zero-1.8.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/oneapi-src/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0/1.8.5"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 src_prepare() {
 	cmake_src_prepare
diff --git a/dev-libs/libmodbus/Manifest b/dev-libs/libmodbus/Manifest
index 5f461f706d79..8cd9fb8d216f 100644
--- a/dev-libs/libmodbus/Manifest
+++ b/dev-libs/libmodbus/Manifest
@@ -1,3 +1,5 @@
 DIST libmodbus-3.1.7.tar.gz 490162 BLAKE2B 3ba8353fbf6849597b1affdb8dc318b8dc1e2f66b0c1bc9f5f3c8286d48609be6d85d84269d31510fe292a48010a72e7a678b748f3c03117a6230651fa80fe91 SHA512 e2c00bd06d0b4a16c8edbfd25a95695b782cf459cd69a7cefc1cfa5e4025f23b2896487b48876ccf2f8050e8cdef4a76d322c9752a43cd8dd2c634df9406bada
+DIST libmodbus-3.1.8.tar.gz 459999 BLAKE2B e5cb17dd260f3d0a25aedb2cecaa35f21c116458b0a46c7fe3ecc51d6ceb162fa387bb3ad18ff78c89f39645184ecc5bb164ef7cef2d091d2727750bdb0e429a SHA512 1158ac52cf92d3f8f8afaa23b67e841018f94c09521464a4c28ab724f7f2beb0eb567d574c2d81cfb1e3df9436cd2635b52a886656985b27df3a27693957d2df
 EBUILD libmodbus-3.1.7.ebuild 737 BLAKE2B d4714e52e46107436b28ef23b9f361f69a4c18afea043cc382a5603b21f86a17d9abb5c8bc44e412f5fddda3b5bfe60f2c3a7477bc57e45aeabb59da440858c7 SHA512 f3191069b13fb718c30de512d8d8e33dd6747529392e00b25f7325eabe0f391fce17e766bfeb85f46eb117e4fd3c743d41d855fc9ba227e58e8b60e930f56b63
-MISC metadata.xml 251 BLAKE2B ba937d5724c861b8bfd1d287a325357d6a63656cf5c2314185a486be769eb22b39fa780b38c05407bce5f0707585d499a849a28e15a2fde9eebba6f529e686a3 SHA512 0fb5b55fc7db96153970767478727504fd0e87c1c8a77593f1f30720064e95776b92e4993f9aed076c983eee5cebca446fe8894e36fbcc02802bb1c158747dd3
+EBUILD libmodbus-3.1.8.ebuild 670 BLAKE2B fe2424677cd1d6edccc36f8aaa3856687ae773a41a170292dbc977387d009374dd8794965ee628cfddbed4415dda65b6097db632506c82a8486af775fdd3d2dd SHA512 448f76410d497941d6de056ec6db6a229fd5c083204aaf78624964f9587c7fb2ede1ce9ef59d594b03f3b5bb62b0fd0ae815b219625a3e0e2aaf8001b41de019
+MISC metadata.xml 400 BLAKE2B 13cbac9e5f8b0b4af1330ef236dff85b8d3f167cabb19979942fa610c525c9d0b532e5c6a359f716ab198872f622dbbbe9575fc1ab53f82b8abe8e4996e6d921 SHA512 248080a171c05cca240271d8dc3e7cd0b30e78100697dddf0a0d8216d4d0c42abc9c52731b0abaa5de9dbacf9c402ada6e1b406699b7eefdb0ede78717d587c5
diff --git a/dev-libs/libmodbus/libmodbus-3.1.8.ebuild b/dev-libs/libmodbus/libmodbus-3.1.8.ebuild
new file mode 100644
index 000000000000..de8b52473bfe
--- /dev/null
+++ b/dev-libs/libmodbus/libmodbus-3.1.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Modbus library which supports RTU communication over a serial line or a TCP link"
+HOMEPAGE="https://libmodbus.org/"
+SRC_URI="https://github.com/stephane/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable test tests)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -delete || die
+	fi
+}
diff --git a/dev-libs/libmodbus/metadata.xml b/dev-libs/libmodbus/metadata.xml
index c07e13d4a6bd..669ea40be1ed 100644
--- a/dev-libs/libmodbus/metadata.xml
+++ b/dev-libs/libmodbus/metadata.xml
@@ -5,4 +5,8 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/stephane/libmodbus/issues</bugs-to>
+		<remote-id type="github">stephane/libmodbus</remote-id>
+	</upstream>
 </pkgmetadata>