gentoo auto-resync : 07:01:2025 - 06:41:06

4 files changed, 159 insertions, 15 deletions

diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest
index b2585b299483..c75cae4e5083 100644
--- a/dev-util/rocm-smi/Manifest
+++ b/dev-util/rocm-smi/Manifest
@@ -6,12 +6,15 @@ AUX rocm-smi-5.7.1-remove-example.patch 560 BLAKE2B 6f541822947e6f458e5c553c307e
 AUX rocm-smi-5.7.1-set-soversion.patch 5234 BLAKE2B b2e40d803d0511e98c87125dae05a415b2ddf38b28f774edfe6fca1bf552e630f872631b3cfe82c1302a1c2d7be83bf7a6b4e67c0f8eb271612999eaec3cba68 SHA512 af51867d0baeca303932b0d38f716a657bf14f57e595056694eadb2c120c741e03615837eee9b86932f1fa04815c2803b6115e5e2cb81ea51b07d558155eb398
 AUX rocm-smi-6.0.2-set-soversion.patch 7897 BLAKE2B 3b18e771001c651b1ab4cb041b7e3da4e799073ef94a1ae9db42ba072430a3f79f5ccb1896190217807105a185235209b4411b33159f4a457fff1d82ebec8aa7 SHA512 9e67af5545b890a3a830a34334c551ec6934146268670549d43fe7a4b249ff8729225b31a603efee0beee3cff910ca14a000dc6b3384d456b8481fbae3864614
 AUX rocm-smi-6.1.1-fix-const-qualifier.patch 517 BLAKE2B d5a35233910380d6a5bb7931bc7861efb22254ce33f4f015ae27d44bef7afa13b5e66afbe5c33dce228a95bb3d82783d3e95570f0a0ec77f6043c69bfe828bf1 SHA512 03c06d0fc663b9e5c57f970596444cf851047c40c5a2511fa5d1c1d196f20ddcfec013bdf6d7789cb62ec60d858abeac69a35b57784de4dfc92bfb8e4131d5e0
+AUX rocm-smi-6.3.0-fix-flags.patch 1363 BLAKE2B 0661f020eaef8afb13223d8a0ea853cd3e9f0e22c98c01638a2aa30518310d24a069670632d4494e84cfc735dac2b06f0fc515e4d3e5b576e68bffe4498b225c SHA512 91523dc9d3250bafc1c3d1d1a5e68d50765956885fa821b6a37ff6a53f3cc7b5bb3515d1d5b44a79ec34e18af625d3e93749dd6e57ac1ec16d578f4668b404ce
+AUX rocm-smi-6.3.0-set-soversion.patch 4811 BLAKE2B 4522a4b40e474d0d8dc2740b82670fa8e7ea404308158f7cffeed21fffe281ebb407b3d8412f0c9a0e0c189a7fd3e7ee3ecd183ab36e8d32264dc2e393afb011 SHA512 ad18a6147e4da0034e409791026a382951247997cc3a0551df08bac431744809940ef45cf274e4419bbdf12fe5ec8b4082054be587f402a7c6731c77750a38b2
 DIST rocm-smi-5.4.2.tar.gz 1553259 BLAKE2B 0560e115028caafb1d5dd8892cfa677431b792714ecd8c75f31451fa7685d1c7070cbd687c894d7eefd112de5e2df9aa7895aa57821db207dffc4e8890898638 SHA512 0fd651593df0ebbcb2c2327d030d2674efacdb6e883daa5a8adf733db2bde3e5d16dc304856221f4bb07a3cd834944ffcc7ebd689624f7ba24ffd6c262ba74b8
 DIST rocm-smi-5.7.1.tar.gz 801646 BLAKE2B b4799bbdaeb7203c16117cd30511d589a2b96e15801bb9f1382fe7a4d87d43e1d4b458d6923b6ebd602fdccba74bd65bcb98766dbd83c48fc3e02219be8c1022 SHA512 ad364278f137228a39108c93d482635137ea2724a5a39debb5b32329493ebf5c706dcf3863e2e24b6f0b6286f3877942277f5ae447446f155518972b957f7d9d
 DIST rocm-smi-6.1.1.tar.gz 872628 BLAKE2B 35830fd0eb36688b3803bed2059f29ba4d8613112ae4cfff2e0a3b1d7afef9f0d77ec16771e2205ba351df0aa678c3b0d2436940b76d10d020f1a30d14d760e9 SHA512 3e31ff0d94e7f0ea650c985973b27107e3f7293b92857fbf2fe196b61632c530e95c3228ad7550d44f8ee9f5f1abfd17e5c2b19164759728fb6d4b0995455fa7
+DIST rocm-smi-6.3.0.tar.gz 902989 BLAKE2B d17a60fd7ea39b2a18828891f50f22efe6a3f875d4f68efd204c49e1f761c690420218852464856f80a6a82eb68cae58c0cb0353c277a621a0a037b1d1a14055 SHA512 2e5079f8387872c126908211f2ceea1d5ba6e4e3e7dc487c1e45387f57e158b0e3ea071cbeaba2f8ffdf70fc6708c33fa19305812e81dbe13335bd7c99638b0e
 EBUILD rocm-smi-5.4.2-r1.ebuild 1507 BLAKE2B 76ea13792d19af4ed76e6ddf11fa45b91a1cf20b4d13dcc14307f6829d0d03ee2a37901aa07ef6b3091adeb1c4e2e5c7a2a25267ce181718208f0d249845618d SHA512 d84c0feaf23ec2d098b45db3e128fb840677d75a0bcef59046b544efc588e7ad7c3b97f6b4d38aa98088428e856cd28438686684e8db89c1d739d5ecbec71a2a
 EBUILD rocm-smi-5.7.1-r2.ebuild 1604 BLAKE2B 213d8d92f900537d4b84b419deca531a8b29bbb9d4ce3a6e64368b789aa341af02d8d5a2417acdc5267e370f16cd9b08a98f24156ce5ae93cae3bb648721b77d SHA512 3ad7dc560bad8eae69e3d78cff802f5a00a3984524bf94a7fab8491a1c043691deb61fe02f41b060caf834dd7210442471a72771b96162e7ff643e7ef918ec55
 EBUILD rocm-smi-5.7.1-r3.ebuild 1657 BLAKE2B cdd28775af1bf308376a951f46ae70e9f2d7d1b5cb7ee9854c6b6d96aa24cc2964c2f793b1a75b8fd7f9903aefaf493e2913e3681e4a94cb3f2a32cc2e5a9abe SHA512 bd64d50bf9247c1de26808b92374310bc9e9001a62a7277ed1808f8f52bcc509c52120de34e665487552b8f9bee16edab597f67627f3697711c974c7e83528bd
 EBUILD rocm-smi-6.1.1.ebuild 1479 BLAKE2B 56815b93b97e4e20f0405ce35467b10d8d8c5813044d995f94da8dcff468af8deb17f6cca2ce43cefdf4bdb63baceb4be64c284d5d4862ea03ad076bc6a974c4 SHA512 3627f49d454a34295ed75031f4480e5cb7758a57a641495b8c1abb19139e307db4a3b72c4e7302550817e02899f28c3fee481cd0a3e058fde473375e12810e77
-EBUILD rocm-smi-9999.ebuild 1454 BLAKE2B 1025768cbe75bb5d815631868c8d9f72ba6dd19a2a0483b0f6fa992a89af4b018731ab247df3679bb836e88e961d80cc94f6550dab70dc00ba25e3d642f5af74 SHA512 5e124efaa71e74ab5b5063244d757f8e9eddc22dbf10d1878c1a5d7ad04dbc88b366470596d4ee48bb489b26bb30e90f8fab51ca756fa0315e5a673971ae8d7e
+EBUILD rocm-smi-6.3.0.ebuild 1555 BLAKE2B dfbd2841e2f920d88d88a3c9e94ae1244bd27896702aaed33a9a9941e64d81bfb8bf5f15136808391a4c6b80bc844ff47226fd650123c2b108cc3c4ea526b75a SHA512 351520525786b06f9627a46fc01d785909fe718ad62550d50957e0f470e7a2cc0646f89560c6174cad5981fd8fc1c2ecb6ffed981b00572290ed96b936f9c32e
 MISC metadata.xml 769 BLAKE2B 4b19247215c20587c6c7b6958dbd2ed57a242e8718d642c602b4067c4ad3e7cc7778a62e2f20b2b940b3281cc6e0a793153e8ff7bfd54aaa7a16e74b8e54ac6c SHA512 76648eff089ed88259457dfea04a4db19393b0d1285b3556a583b7750782a3b2406e2c407c2c7cdff47cabf1c7377fdf8a053b74226f73c32426155361dc0c83
diff --git a/dev-util/rocm-smi/files/rocm-smi-6.3.0-fix-flags.patch b/dev-util/rocm-smi/files/rocm-smi-6.3.0-fix-flags.patch
new file mode 100644
index 000000000000..1eb96594a968
--- /dev/null
+++ b/dev-util/rocm-smi/files/rocm-smi-6.3.0-fix-flags.patch
@@ -0,0 +1,34 @@
+Fix cxx/linker flags
+Upstream PR: https://github.com/ROCm/rocm_smi_lib/pull/211
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -95,7 +95,7 @@ set(CMAKE_CXX_FLAGS
+ 
+ # Clang does not set the build-id
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+-    set (CMAKE_SHARED_LINKER_FLAGS "-Wl,--build-id=sha1")
++    set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--build-id=sha1")
+ endif()
+ 
+ # Use this instead of above for 32 bit
+@@ -129,10 +129,16 @@ else ()
+     set(CMAKE_CXX_FLAGS
+       "${CMAKE_CXX_FLAGS} -DFORTIFY_SOURCE=2 -fstack-protector-all -Wcast-align")
+     ## More security breach mitigation flags
+-    set(CMAKE_CXX_FLAGS
+-      "${CMAKE_CXX_FLAGS} -Wl,-z,noexecstack -Wl,-znoexecheap -Wl,-z,relro ")
+-    set(CMAKE_CXX_FLAGS
+-      "${CMAKE_CXX_FLAGS} -Wtrampolines -Wl,-z,now")
++    set(HARDENING_LDFLAGS
++      "${HARDENING_LDFLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
++    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${HARDENING_LDFLAGS}")
++    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${HARDENING_LDFLAGS}")
++
++    include(CheckCXXCompilerFlag)
++    check_cxx_compiler_flag("-Wtrampolines" CXX_SUPPORTS_WTRAMPOLINES)
++    if (CXX_SUPPORTS_WTRAMPOLINES)
++        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wtrampolines")
++    endif ()
+ endif ()
+ 
+ set(COMMON_SRC_DIR "${PROJECT_SOURCE_DIR}/src")
diff --git a/dev-util/rocm-smi/files/rocm-smi-6.3.0-set-soversion.patch b/dev-util/rocm-smi/files/rocm-smi-6.3.0-set-soversion.patch
new file mode 100644
index 000000000000..3ababf997828
--- /dev/null
+++ b/dev-util/rocm-smi/files/rocm-smi-6.3.0-set-soversion.patch
@@ -0,0 +1,104 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -33,20 +33,17 @@ set(SHARE_INSTALL_PREFIX
+     "share/${ROCM_SMI}"
+     CACHE STRING "Tests and Example install directory")
+ 
+-# provide git to utilities
+-find_program (GIT NAMES git)
+-
+-## Setup the package version based on git tags.
+-set(PKG_VERSION_GIT_TAG_PREFIX "rsmi_pkg_ver")
+-get_package_version_number("7.3.0" ${PKG_VERSION_GIT_TAG_PREFIX} GIT)
+-message("Package version: ${PKG_VERSION_STR}")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR "${CPACK_PACKAGE_VERSION_MAJOR}")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR "${CPACK_PACKAGE_VERSION_MINOR}")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_PATCH "${CPACK_PACKAGE_VERSION_PATCH}")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_BUILD "0")
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_HASH "${PKG_VERSION_HASH}")
+-
+-set(${ROCM_SMI_LIBS_TARGET}_VERSION_STRING "${${ROCM_SMI_LIBS_TARGET}_VERSION_MAJOR}.${${ROCM_SMI_LIBS_TARGET}_VERSION_MINOR}.${${ROCM_SMI_LIBS_TARGET}_VERSION_PATCH}+${${ROCM_SMI_LIBS_TARGET}_VERSION_HASH}")
++set(VERSION_MAJOR "@VERSION_MAJOR@")
++set(VERSION_MINOR "@VERSION_MINOR@")
++set(VERSION_PATCH "@VERSION_PATCH@")
++set(PKG_VERSION_STR "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
++set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}")
++set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
++set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
++set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
++set(rocm_smi_VERSION_MAJOR "${VERSION_MAJOR}")
++set(rocm_smi_VERSION_MINOR "${VERSION_MINOR}")
++set(rocm_smi_VERSION_PATCH "${VERSION_PATCH}")
+ 
+ # The following default version values should be updated as appropriate for
+ # ABI breaks (update MAJOR and MINOR), and ABI/API additions (update MINOR).
+--- a/oam/CMakeLists.txt
++++ b/oam/CMakeLists.txt
+@@ -29,17 +29,6 @@ set(OAM_NAME "oam")
+ set(OAM_COMPONENT "lib${OAM_NAME}")
+ set(OAM_TARGET "${OAM_NAME}")
+ 
+-################# Determine the library version #########################
+-set(SO_VERSION_GIT_TAG_PREFIX "oam_so_ver")
+-
+-# VERSION_* variables should be set by get_version_from_tag
+-message("Package version: ${PKG_VERSION_STR}")
+-
+-# Debian package specific variables
+-# Set a default value for the package version
+-get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT)
+-
+-# VERSION_* variables should be set by get_version_from_tag
+ if ( ${ROCM_PATCH_VERSION} )
+     set ( VERSION_PATCH ${ROCM_PATCH_VERSION})
+     set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+--- a/python_smi_tools/rsmiBindingsInit.py.in
++++ b/python_smi_tools/rsmiBindingsInit.py.in
+@@ -26,17 +26,7 @@ def initRsmiBindings(silent=False):
+     if (rocm_smi_lib_path != None):
+         path_librocm = rocm_smi_lib_path
+     else:
+-        path_librocm = os.path.dirname(os.path.realpath(__file__)) + '/../../@CMAKE_INSTALL_LIBDIR@/librocm_smi64.so.@VERSION_MAJOR@'
+-
+-    if not os.path.isfile(path_librocm):
+-        print_silent('Unable to find %s . Trying /opt/rocm*' % path_librocm)
+-        for root, dirs, files in os.walk('/opt', followlinks=True):
+-            if 'librocm_smi64.so.@VERSION_MAJOR@' in files:
+-                path_librocm = os.path.join(os.path.realpath(root), 'librocm_smi64.so.@VERSION_MAJOR@')
+-        if os.path.isfile(path_librocm):
+-            print_silent('Using lib from %s' % path_librocm)
+-        else:
+-            print('Unable to find librocm_smi64.so.@VERSION_MAJOR@')
++        path_librocm = 'librocm_smi64.so'
+ 
+     # ----------> TODO: Support static libs as well as SO
+     try:
+@@ -44,7 +34,7 @@ def initRsmiBindings(silent=False):
+         return CDLL(path_librocm)
+     except OSError:
+         print('Unable to load the rocm_smi library.\n'\
+-              'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so.@VERSION_MAJOR@\n'\
++              'Set LD_LIBRARY_PATH to the folder containing librocm_smi64.so\n'\
+               '{0}Please refer to https://github.com/'\
+               'RadeonOpenCompute/rocm_smi_lib for the installation guide.{1}'\
+               .format('\33[33m', '\033[0m'))
+--- a/rocm_smi/CMakeLists.txt
++++ b/rocm_smi/CMakeLists.txt
+@@ -31,17 +31,6 @@ set(ROCM_SMI_TARGET "${ROCM_SMI}64")
+ ## Include common cmake modules
+ include(utils)
+ 
+-################# Determine the library version #########################
+-set(SO_VERSION_GIT_TAG_PREFIX "rsmi_so_ver")
+-
+-# VERSION_* variables should be set by get_version_from_tag
+-message("Package version: ${PKG_VERSION_STR}")
+-
+-# Debian package specific variables
+-# Set a default value for the package version
+-get_version_from_tag("1.0.0.0" ${SO_VERSION_GIT_TAG_PREFIX} GIT)
+-
+-# VERSION_* variables should be set by get_version_from_tag
+ if ( ${ROCM_PATCH_VERSION} )
+     set ( VERSION_PATCH ${ROCM_PATCH_VERSION})
+     set(SO_VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
diff --git a/dev-util/rocm-smi/rocm-smi-9999.ebuild b/dev-util/rocm-smi/rocm-smi-6.3.0.ebuild
index bc4f8b802371..e555519ada9c 100644
--- a/dev-util/rocm-smi/rocm-smi-9999.ebuild
+++ b/dev-util/rocm-smi/rocm-smi-6.3.0.ebuild
@@ -1,50 +1,50 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} python3_13t )
 
 inherit cmake python-r1
 
 DESCRIPTION="ROCm System Management Interface Library"
-HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib"
+HOMEPAGE="https://github.com/ROCm/rocm_smi_lib"
 
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib"
+	EGIT_REPO_URI="https://github.com/ROCm/rocm_smi_lib"
 	EGIT_BRANCH="master"
 else
-	SRC_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz"
+	SRC_URI="https://github.com/ROCm/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz"
 	KEYWORDS="~amd64"
 	S="${WORKDIR}/rocm_smi_lib-rocm-${PV}"
 fi
 
 LICENSE="MIT NCSA-AMD"
 SLOT="0/$(ver_cut 1-2)"
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND=""
 RDEPEND="${PYTHON_DEPS}"
-BDEPEND=""
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.2-gcc12-memcpy.patch
-	"${FILESDIR}"/${PN}-5.4.2-detect-builtin-amdgpu.patch
+	"${FILESDIR}"/${PN}-5.7.1-no-strip.patch
+	"${FILESDIR}"/${PN}-5.7.1-remove-example.patch
+	"${FILESDIR}"/${PN}-6.3.0-set-soversion.patch
+	"${FILESDIR}"/${PN}-6.3.0-fix-flags.patch
 )
 
 src_prepare() {
-	sed -e "/LICENSE.txt/d" -i CMakeLists.txt || die
-	sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" \
-		-i python_smi_tools/rsmiBindings.py || die
 	cmake_src_prepare
+
+	sed -e "s/@VERSION_MAJOR@/$(ver_cut 1)/" \
+		-e "s/@VERSION_MINOR@/$(ver_cut 2)/" \
+		-e "s/@VERSION_PATCH@/$(ver_cut 3)/" \
+		-i CMakeLists.txt || die
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON
 		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
 	)
 	cmake_src_configure
@@ -54,4 +54,7 @@ src_install() {
 	cmake_src_install
 	python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi
 	python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py
+	python_foreach_impl python_domodule python_smi_tools/rsmiBindingsInit.py
+
+	mv "${ED}"/usr/share/doc/rocm_smi "${ED}/usr/share/doc/${PF}" || die
 }