gentoo auto-resync : 27:06:2024 - 07:59:39

6 files changed, 82 insertions, 2 deletions

diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 467d64d105be..87a3607ea077 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
diff --git a/dev-build/rocm-cmake/Manifest b/dev-build/rocm-cmake/Manifest
index 28ece17a7858..fa82be83a476 100644
--- a/dev-build/rocm-cmake/Manifest
+++ b/dev-build/rocm-cmake/Manifest
@@ -1,4 +1,8 @@
 AUX rocm-cmake-5.0.2-license.patch 631 BLAKE2B f3beee352aa6dba1d8b30e9e4193915d8b97d3aac3143f79b12c7b6f438a3557d6ee3eabb7835764cb5b2470f6f6f20ef82757356bd8e2f43eeeb8e20966d4c2 SHA512 818a019b93cfa0712fdb8faba32e7415aafa68b337cc147f3259165ffc028ec2e0353cfb0680053cdc8e8069c75df07356939eb7adb5b1295010e4d501a59546
+AUX rocm-cmake-6.1.1-license.patch 520 BLAKE2B 4a00b068a3bb330ad2a1b981e6f36f8ac700e7d14e234541ede8657f30583c7e16b89f7729d559f36e7909fa9c43bc123a9bfb4a2b3778833b9a2af157b926f8 SHA512 8a4dd0b1035f66c233bec885ea64ceca5c2d8e140fb9de752f09de08c996551123abc45b2a6967b1696aef16924727268521f9c00d99ef9e6e8783d9c1bbf520
+AUX rocm-cmake-6.1.1-no-rocmchecks-warnings.patch 1431 BLAKE2B eedeb63f394ace78c298ac77e920a43616924a475d53154b9e904c44dd0118defc7aa7405963dacbb9d60e49fe1be78533e9896e6f9d92bc9acc48fee6ee806c SHA512 45599dfe29f1800319baf36635a8306b73aac4425797168235be578554e63b43a12b451fc343231d735d1d1bbae073bf1192c4c3292ce1014db8fbb130b5cc7a
 DIST rocm-cmake-5.7.1.tar.gz 50940 BLAKE2B f3a36cedfc15af69819b576bf8f8bdfe7b49e5dd1d4db57f707295f14a8d64904745f454fc211b28adfde369c82cb42a061c05b6675679e11a3946f6ebfea6d5 SHA512 1265ed8e23a04f9cff57b43f815e8fbbb1a3f200bc040e01ceaa92c322088c9ef04da795b09d732c6466dc9a3fefc505b8b474d3f18f55cff491758aa53a6e6b
+DIST rocm-cmake-6.1.1.tar.gz 86888 BLAKE2B 91064e82199ac317c273005b9b6c07e33ab5199b456467e84ac0937036d26d1d5c1286e1e38932b2da11700fb2a7a90795e34d4a7c03ed3bf58959402060091e SHA512 af6d4e124a3ec4d1e810867db69d738ebe7cfea672065bb5279b72a4d4efce8c14305e76173f760044977082c6aa069453d8eef488368a88ac57eb9df20f8b0c
 EBUILD rocm-cmake-5.7.1.ebuild 775 BLAKE2B 00c9e426dee2cb49d2ec17149f388a8262217c4fe6bfef406bb9bb8c8e2ab2519f28b6043560bea3c0722729fcdebe7b7488ece5780783aaf6ab4a1534061d20 SHA512 90b114853f760f8622b7a1c3a403d81cd555258a41bea56b6ae5bca83d20287a5b314ecbc5413bccede7083e2aa5ae783dd215dda7e4fe954257e3dd927c1423
-MISC metadata.xml 504 BLAKE2B 5b7976e66353bfe9bec6d7c7ebb318d4f3922f4128e0a5f224fb983b876d9fd328c0d3dea68f4d92f3d740555eaaf5ef99de610957f0375076a3e8f5df04eb99 SHA512 32299ceb61b177b44e8117c5e2d249df25f75ddb5398bc1bd62bcb0462347a183fcdac6f9c14d6e2fd076d860dab401d9e6f7714ac3492adea7268edd953421f
+EBUILD rocm-cmake-6.1.1.ebuild 912 BLAKE2B e0a965c617856b22bc43b142be1de8a030da43dc5b9c375eabb14de2b2254e6f2badaa80727b2e94e38a85bfff7bb36124a5ec4a9935c6f3c69728be2a5dfb7b SHA512 add66398a09ba709b6b702dd794361202b68e42c1f946ed1d156cf3b7c2dfaea9bbf2c2b94ad1d4b762a0e1ff8b583f1d7a4d1fc4f273f1c8dcbd69199b6a4e9
+MISC metadata.xml 612 BLAKE2B cbab269204bacde90025f8f0575016692e4d7785127fcad21bdac56cd3c6b1e5a8b52b4abfefbdb91cf39db9c0a06ca90b1a37bffdb106319540a899d5c5e896 SHA512 d39324e34a7374dfa1fc43aa93d9f6c439b8d6311605b37919fe18c776d881713cc6b874a43428a607be00ffcc8a0b7c1b8cd62d0f6f039b1ec2d255b17cee1a
diff --git a/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-license.patch b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-license.patch
new file mode 100644
index 000000000000..f8770b345f85
--- /dev/null
+++ b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-license.patch
@@ -0,0 +1,12 @@
+This is not needed. Gentoo will collect license files into
+the documentation directory in ebuild.
+--- a/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake
++++ b/share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake
+@@ -409,7 +409,6 @@ macro(rocm_create_package)
+     if(PARSE_PTH)
+         rocm_parse_python_syspath(${LIB_DIR} ${PARSE_NAME})
+     endif()
+-    rocm_setup_license(${PARSE_HEADER_ONLY})
+     if(PARSE_COMPONENTS)
+         rocm_set_comp_cpackvar(PARSE_HEADER_ONLY "${PARSE_COMPONENTS}")
+     endif()
diff --git a/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-no-rocmchecks-warnings.patch b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-no-rocmchecks-warnings.patch
new file mode 100644
index 000000000000..73030e7b9b20
--- /dev/null
+++ b/dev-build/rocm-cmake/files/rocm-cmake-6.1.1-no-rocmchecks-warnings.patch
@@ -0,0 +1,25 @@
+Gentoo uses cmake -C <...>/gentoo_common_config.cmake approach to set toolchain variables.
+There is nothing wrong there, so there is no need to print huge ROCMChecks warnings.
+--- a/share/rocmcmakebuildtools/cmake/ROCMChecks.cmake
++++ b/share/rocmcmakebuildtools/cmake/ROCMChecks.cmake
+@@ -34,20 +34,6 @@ function(rocm_check_toolchain_var var access value list_file)
+         elseif("${base}" MATCHES ".*/CMakeFiles/${CMAKE_VERSION}$")
+             set(cmake_module On)
+         endif()
+-        if(NOT cmake_module)
+-            message( "
+-*******************************************************************************
+-*------------------------------- ${message_title} --------------------------*
+-  Options and properties should be set on a cmake target where possible. The
+-  variable '${var}' may be set by the cmake toolchain, either by
+-  calling 'cmake -D${var}=\"${value}\"'
+-  or set in a toolchain file and added with
+-  'cmake -DCMAKE_TOOLCHAIN_FILE=<toolchain-file>'. ROCMChecks now calling:")
+-            message(${message_type} "'${var}' is set at ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt:<line#> shown below:")
+-            message( "*-----------------------------------------------------------------------------*
+-*******************************************************************************
+-")
+-        endif()
+     endif()
+ endfunction()
+ if(UNIX AND (ROCM_WARN_TOOLCHAIN_VAR OR ROCM_ERROR_TOOLCHAIN_VAR))
diff --git a/dev-build/rocm-cmake/metadata.xml b/dev-build/rocm-cmake/metadata.xml
index e13f2f7b5728..9b05010ce860 100644
--- a/dev-build/rocm-cmake/metadata.xml
+++ b/dev-build/rocm-cmake/metadata.xml
@@ -9,7 +9,11 @@
         <email>candrews@gentoo.org</email>
         <name>Craig Andrews</name>
     </maintainer>
+    <maintainer type="person">
+      <email>lockalsash@gmail.com</email>
+      <name>Sv. Lockal</name>
+    </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/rocm-cmake</remote-id>
+        <remote-id type="github">ROCm/rocm-cmake</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild b/dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild
new file mode 100644
index 000000000000..7d097ae7d18f
--- /dev/null
+++ b/dev-build/rocm-cmake/rocm-cmake-6.1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ROCm/rocm-cmake.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ROCm/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm-cmake-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/ROCm/rocm-cmake"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+RESTRICT="test"
+
+DOCS=( CHANGELOG.md LICENSE README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.1-license.patch
+	"${FILESDIR}"/${PN}-6.1.1-no-rocmchecks-warnings.patch
+)
+
+src_prepare() {
+	sed -e "/CMAKE_INSTALL_LIBDIR/s:lib:$(get_libdir):" \
+		-i "share/rocmcmakebuildtools/cmake/ROCMCreatePackage.cmake" \
+		-i "share/rocmcmakebuildtools/cmake/ROCMInstallTargets.cmake" || die
+	cmake_src_prepare
+}