gentoo auto-resync : 11:12:2023 - 11:18:53

4 files changed, 7 insertions, 7 deletions

diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index ff8e65deb9e0..83fab1e63062 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/kineto/Manifest b/sci-libs/kineto/Manifest
index f5a8d6dee165..b70ababb96d8 100644
--- a/sci-libs/kineto/Manifest
+++ b/sci-libs/kineto/Manifest
@@ -1,8 +1,8 @@
 AUX kineto-0.4.0-gcc13.patch 255 BLAKE2B 5633abeae41fd306a6d66d4e0f72040abbcc27b052a9802c94235c4afcff5ed99f3ac0df9ed712c6d4a57345d666442ea89bcc84f9f7d333d2ec77be9246a1d5 SHA512 db55567e22355f7ca98959f6a385b103474b2aeed0684f48e0c2e043754defc888fbd6ae997c3e5909329777d662b2e4e1b85520192da7fcae32845798c4565d
-AUX kineto-0.4.0_p20231031-gentoo.patch 2949 BLAKE2B 63604018359971d040211647cfdf599feb75a085fe90f28da9d440d073e4598508b0dcb26244a8daac87fd97c2fc951ec7837fef58cdecd584340a8ab866d058 SHA512 f5b545cf8b376ca7bb06b36424fac9afb7dd21cc38214785bbdc119c75dd9f5636d79715cfa4e026ba6935edf59ece0327fdac8702394a98f829dded09783461
+AUX kineto-0.4.0_p20231031-gentoo.patch 2997 BLAKE2B 123603ac81512b12800a0ef82fd0f573891c4170a16156f87afbdb7004608cf2593eccd23541aa2f042137762dc5d4a1d4013e9fa42303fb8e60066f96529030 SHA512 e7f4d0c7418cb3d4b00cd231b03692dd6b0fd3c29d54f6db557bb87d4ab000e5020d03fffec1583b7c2df8b0431e7f263a4c892eadc16e04ce8af2c9032b47fe
 AUX kineto-2021.11.17-gentoo.patch 2919 BLAKE2B 6b7dfe7aa1df3b797c71574233bb48c1f9d47c460bb5a80fc9bf1108eacb928fe70b009207bfb1570c074ea65e67960e18d82bb75aa295d911a57dca190da8f7 SHA512 55b8b4f714f99bba714ddec804904d08b2042b20f6649c0a049ecbe3027f4b5ee6800705ffa8ac3e7cc2af88e9f25a145714dfe1d2e49e81bb99b4e2171aa597
 DIST kineto-0.4.0.tar.gz 8190627 BLAKE2B 015017096b6a01b2f2172580884aef6c57df0d33c3d8904c959acc7f7dcc36386f72acb9a672571fa25b7f74c1d2d763692b8cc5a634a73ac143819f811737df SHA512 4a3cbf2f29aa174b9a67f55d0f4e7b8d952ed5dba612f33d144a4d019055031e2a6ff8c98ef1971bf2508460cb871dace38bfc669c10c076cc42d685a1842d86
 DIST kineto-0.4.0_p20231031.tar.gz 8234532 BLAKE2B 11ff60f865a09f651facdb9752d9cb401f89d36d72f977b79fd35a128fe6666c6cba6aaaf8119a939d1e26b30dff55d8d30f484c7d9fb4ab626327f2bd574bf4 SHA512 48421d9a6f4487112f37222350b33a171fc0e2119fa4636380e6ecb6574300576325d5c21affc8ab3b9769264ab549918fa2c4e5fee2c2e24c09c1f3f87f3444
 EBUILD kineto-0.4.0.ebuild 737 BLAKE2B 70cc19d80144d22bee4b7608573381b99f3f72af1428a527dbfc7c3099c12d4d3b0ad59de820078fece318fd6873a97ab6ba2fdb622c39af4276f39385662fea SHA512 38953a8d37ca465881997e49ea63b3bbf2fb77bee1c03801b2c5a1176ee4a2649b411abf26e683391aeacd85bf5ccb922f2234c34290b63415535a1fc882295a
-EBUILD kineto-0.4.0_p20231031.ebuild 898 BLAKE2B 6af682ef678384ec5e69d328c6e335db8b42343bf127b698236fbcef36323edafb93955c04efb49d923f3b373f103ce586132ffd0ff2b06287cf9216dc0f81f4 SHA512 1a15b398ed9d2480965638fb0eb6c6aed076369ae3207f0a7e2ab3964acac81ad74cf3f1e7653d87edeeef1dfe0cf018ebe83772aec899597c009265bd76cbf4
+EBUILD kineto-0.4.0_p20231031.ebuild 940 BLAKE2B 6189aa45f76e72ba6aeebc6a80c6a058c067e27a4a874dda9fb89bcce451d5ad4b06cc956c16473010e1d058ac36a07b21b8d345bff4f0a3ce6876799e80fc08 SHA512 0ea70c9ef8a90007453a55487c844cb7f55038ed74a5b282ef0913e656309dbd73cf5304071c9759679a22e9a3b92c23103f11526f2f5f5112c8bca0067c8bab
 MISC metadata.xml 327 BLAKE2B f48b87396bdfbc5a12b807941e162b596bbf760252fbfd08dc05ef8aeb9dcd8fc1b0ed3c8d4ec5f531da5a7315a041b8db7b0f6449c86fc52fba4f6d4476beb5 SHA512 9f6906e171f530b6f5de417338af00c26681fe757d823b4ab88cb9749506404c2d9baa96ea3c71c4fe523f6f5877a81e20f2378abe4a2e9895e501829e3fe85d
diff --git a/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch b/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch
index 29804d93161c..d0f8790ae5a5 100644
--- a/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch
+++ b/sci-libs/kineto/files/kineto-0.4.0_p20231031-gentoo.patch
@@ -35,8 +35,8 @@
  
 -set(DYNOLOG_INCLUDE_DIR "${LIBKINETO_THIRDPARTY_DIR}/dynolog/")
 -set(IPCFABRIC_INCLUDE_DIR "${DYNOLOG_INCLUDE_DIR}/dynolog/src/ipcfabric/")
-+set(DYNOLOG_INCLUDE_DIR "/usr/include/dynolog/")
-+set(IPCFABRIC_INCLUDE_DIR "/usr/include/dynolog/src/ipcfabric/")
++set(DYNOLOG_INCLUDE_DIR "@GENTOO_PORTAGE_EPREFIX@/usr/include/dynolog/")
++set(IPCFABRIC_INCLUDE_DIR "@GENTOO_PORTAGE_EPREFIX@/usr/include/dynolog/src/ipcfabric/")
  
  message(INFO " CUPTI_INCLUDE_DIR = ${CUPTI_INCLUDE_DIR}")
  message(INFO " ROCTRACER_INCLUDE_DIR = ${ROCTRACER_INCLUDE_DIR}")
diff --git a/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild b/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild
index fb7e15a451db..aa8b2eea8a00 100644
--- a/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild
+++ b/sci-libs/kineto/kineto-0.4.0_p20231031.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
-inherit python-any-r1 cmake
+inherit python-any-r1 cmake prefix
 
 CommitId=a30ca3f9509c2cfd28561abbca51328f0bdf9014
 
@@ -30,7 +30,6 @@ BDEPEND="
 RESTRICT="!test? ( test )"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${PN}-0.4.0-gcc13.patch
 )
 
@@ -44,8 +43,9 @@ src_prepare() {
 src_configure() {
 	cd libkineto
 	local mycmakeargs=(
-		-DLIBKINETO_THIRDPARTY_DIR=/usr/include/
+		-DLIBKINETO_THIRDPARTY_DIR="${EPREFIX}"/usr/include/
 	)
+	eapply $(prefixify_ro "${FILESDIR}"/${P}-gentoo.patch)
 
 	cmake_src_configure
 }