gentoo resync : 20.03.2022

5 files changed, 211 insertions, 14 deletions

diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest
index 02c38dd6bce8..0b00bee3234e 100644
--- a/dev-util/rocm-smi/Manifest
+++ b/dev-util/rocm-smi/Manifest
@@ -1,4 +1,10 @@
 DIST rocm-smi-4.0.0.tar.gz 45065 BLAKE2B 90a28c162099deaa67c98701b79328c760973d88fa598f8a66116927483f25dbfd85366312c4c6e8e64fa2199dfb32fb661db04b464bd58cb39dea09a84ac51e SHA512 63c1274470df079320164d29cb4c009f52e59ffebdadfefe73cbe21238a70858fd5a86417b9f81ab2c405bc64707b02ddbf65e9d301f757f245b60152cd63dcf
+DIST rocm-smi-4.3.0.tar.gz 1672482 BLAKE2B 21b35daa565ce368ac10110ba73f723c5d2125e401f5c8fa2d8e3300f450f39dd0c1de74681249868a842b568af0f2cf0d1f7bf0d40d338a7d1ee7c9e25b67dd SHA512 2bf5d3f1be50636c7c848cfa982fcdb6fbf25d648bcbe2a195e1153c7f4c8b11b2b3650aaa110eec780a218a1503afe84637c7d6e7e868e7065f8c51d8d3b8dd
+DIST rocm-smi-4.5.2.tar.gz 1674835 BLAKE2B 7cf69170a4a8dedfdc467e3b8dc64bd829136062487814e169cca0deabcd05d8adaf4fc440173e10cd8117ae63119f10a09c3042b0915b865e0620322c940e91 SHA512 640645d07dbc93a85d4e498bcc88fa0caab36b5af0f9feabf8a2383786ccb2b588be625f46e90d1b71803c011891a62a3642098fd0eb83530d5d8e0a49d204dc
+DIST rocm-smi-5.0.2.tar.gz 1677784 BLAKE2B 28e136a8b3c630ed7d5b514ad5bf985ff540df8e1fc2378b855032a6ebd2bcbcd4aab5e8a5a9e6462eacd2ac9ada0b8940aed582ce118d1066bded115af42e22 SHA512 bbad2bbebb81de42a15d8aa48e4751dbf9b8f9ee74633d16828f6977fadff35e9db0b7c9ee465a61c40a3e8f2f0f99b79cd5c5b142785cf61958d432f13d7f05
 EBUILD rocm-smi-4.0.0.ebuild 769 BLAKE2B 4a153b49245275a87f45e02d67f86d94c6bf6ea7b2df93cf5a0061f3b7c5b6de33b39c4fd220fa04d8642647eac47383635b84a2c7ec91679ebb09d4e3803897 SHA512 24a62c42e875f0895effa97e6979f41e276b66f0d53198ac549dfce68c1229336ac05241507c7c2ad123874f551d6ca81de7d3496654116956d42dd470fc6039
-EBUILD rocm-smi-9999.ebuild 769 BLAKE2B 4a153b49245275a87f45e02d67f86d94c6bf6ea7b2df93cf5a0061f3b7c5b6de33b39c4fd220fa04d8642647eac47383635b84a2c7ec91679ebb09d4e3803897 SHA512 24a62c42e875f0895effa97e6979f41e276b66f0d53198ac549dfce68c1229336ac05241507c7c2ad123874f551d6ca81de7d3496654116956d42dd470fc6039
+EBUILD rocm-smi-4.3.0.ebuild 1721 BLAKE2B 6238286bdbc3fe377672443c44412c4111767dea037b698335ed6e5ce13d2b4d680e25ff2119d2023877e72348f502f0b0df78f68bdf64c0256a9723cc428b1b SHA512 c0e9530f588736f1bbd31f5acf29f5979f9884ac2efb58913f146d1582424bdcc725c8262c6adead998b5d0d232a8bca8e31d7eddca713ef53acbb62cdc48ed6
+EBUILD rocm-smi-4.5.2.ebuild 1721 BLAKE2B 6238286bdbc3fe377672443c44412c4111767dea037b698335ed6e5ce13d2b4d680e25ff2119d2023877e72348f502f0b0df78f68bdf64c0256a9723cc428b1b SHA512 c0e9530f588736f1bbd31f5acf29f5979f9884ac2efb58913f146d1582424bdcc725c8262c6adead998b5d0d232a8bca8e31d7eddca713ef53acbb62cdc48ed6
+EBUILD rocm-smi-5.0.2.ebuild 1733 BLAKE2B 01ae4d2dbb4c8a034821282f0e26def050434fbc6a473263b261088e647f873e406c099f3a069d01b12b51d3ae6396be6cfe4f0fb1a8db7164dd684c848358e0 SHA512 7dbbdc6dd08c5f1122d9abb6905a105887dc3707fa425fbbce5493fa8803f921a4075071055d8d586d235d00a49ddcc557e7287d9c8b3f57d4a93d106332904e
+EBUILD rocm-smi-9999.ebuild 1721 BLAKE2B 6238286bdbc3fe377672443c44412c4111767dea037b698335ed6e5ce13d2b4d680e25ff2119d2023877e72348f502f0b0df78f68bdf64c0256a9723cc428b1b SHA512 c0e9530f588736f1bbd31f5acf29f5979f9884ac2efb58913f146d1582424bdcc725c8262c6adead998b5d0d232a8bca8e31d7eddca713ef53acbb62cdc48ed6
 MISC metadata.xml 661 BLAKE2B ed6ec563956132012b44907f348091135c7a463fc47a51ac0726e7749da9a4c33811df87442e576fb510799a50c14949cd20c8ca10a5850ee941a8794b70ef7d SHA512 c047963068b4ccefb73539ecd91b4c3310f0863a674acb15e9843dda7f0c917616dc8cbfe5f859e42d9ee25323bf1b66b1ce7fbe9a2e8292963ac38aa0bd72f3
diff --git a/dev-util/rocm-smi/rocm-smi-4.3.0.ebuild b/dev-util/rocm-smi/rocm-smi-4.3.0.ebuild
new file mode 100644
index 000000000000..10683f1541f3
--- /dev/null
+++ b/dev-util/rocm-smi/rocm-smi-4.3.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake multilib prefix python-r1 python-utils-r1
+
+DESCRIPTION="ROCm System Management Interface Library"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/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"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm_smi_lib-rocm-${PV}"
+fi
+
+LICENSE="NCSA-AMD"
+SLOT="0/$(ver_cut 1-2)"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND=""
+
+src_prepare() {
+	sed -e "/DESTINATION/s,\${OAM_NAME}/lib,$(get_libdir)," \
+		-e "/DESTINATION/s,oam/include/oam,include/oam," -i oam/CMakeLists.txt || die
+	sed -e "/link DESTINATION/,+1d" \
+		-e "/DESTINATION/s,\${ROCM_SMI}/lib,$(get_libdir)," \
+		-e "/bindings_link/,+3d" \
+		-e "/rsmiBindings.py/,+1d" \
+		-e "/DESTINATION/s,rocm_smi/include/rocm_smi,include/rocm_smi," -i rocm_smi/CMakeLists.txt || die
+	sed -e "/LICENSE.txt/d" -e "s,\${ROCM_SMI}/lib/cmake,$(get_libdir)/cmake,g" -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
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_foreach_impl python_newexe python_smi_tools/rocm_smi.py rocm-smi
+	python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py
+}
diff --git a/dev-util/rocm-smi/rocm-smi-4.5.2.ebuild b/dev-util/rocm-smi/rocm-smi-4.5.2.ebuild
new file mode 100644
index 000000000000..10683f1541f3
--- /dev/null
+++ b/dev-util/rocm-smi/rocm-smi-4.5.2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake multilib prefix python-r1 python-utils-r1
+
+DESCRIPTION="ROCm System Management Interface Library"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/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"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm_smi_lib-rocm-${PV}"
+fi
+
+LICENSE="NCSA-AMD"
+SLOT="0/$(ver_cut 1-2)"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND=""
+
+src_prepare() {
+	sed -e "/DESTINATION/s,\${OAM_NAME}/lib,$(get_libdir)," \
+		-e "/DESTINATION/s,oam/include/oam,include/oam," -i oam/CMakeLists.txt || die
+	sed -e "/link DESTINATION/,+1d" \
+		-e "/DESTINATION/s,\${ROCM_SMI}/lib,$(get_libdir)," \
+		-e "/bindings_link/,+3d" \
+		-e "/rsmiBindings.py/,+1d" \
+		-e "/DESTINATION/s,rocm_smi/include/rocm_smi,include/rocm_smi," -i rocm_smi/CMakeLists.txt || die
+	sed -e "/LICENSE.txt/d" -e "s,\${ROCM_SMI}/lib/cmake,$(get_libdir)/cmake,g" -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
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_foreach_impl python_newexe python_smi_tools/rocm_smi.py rocm-smi
+	python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py
+}
diff --git a/dev-util/rocm-smi/rocm-smi-5.0.2.ebuild b/dev-util/rocm-smi/rocm-smi-5.0.2.ebuild
new file mode 100644
index 000000000000..d9dd59e76bf1
--- /dev/null
+++ b/dev-util/rocm-smi/rocm-smi-5.0.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-r1
+
+DESCRIPTION="ROCm System Management Interface Library"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/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"
+	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=""
+
+src_prepare() {
+	sed -e "/DESTINATION/s,\${OAM_NAME}/lib,$(get_libdir)," \
+		-e "/DESTINATION/s,oam/include/oam,include/oam," -i oam/CMakeLists.txt || die
+	sed -e "/link DESTINATION/,+1d" \
+		-e "/DESTINATION/s,\${ROCM_SMI}/lib,$(get_libdir)," \
+		-e "/bindings_link/,+3d" \
+		-e "/rsmiBindings.py/,+1d" \
+		-e "/DESTINATION/s,rocm_smi/include/rocm_smi,include/rocm_smi," -i rocm_smi/CMakeLists.txt || die
+	sed -e "/LICENSE.txt/d" -e "s,\${ROCM_SMI}/lib/cmake,$(get_libdir)/cmake,g" -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
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_foreach_impl python_newexe python_smi_tools/rocm_smi.py rocm-smi
+	python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py
+}
diff --git a/dev-util/rocm-smi/rocm-smi-9999.ebuild b/dev-util/rocm-smi/rocm-smi-9999.ebuild
index f05a44aba607..10683f1541f3 100644
--- a/dev-util/rocm-smi/rocm-smi-9999.ebuild
+++ b/dev-util/rocm-smi/rocm-smi-9999.ebuild
@@ -1,34 +1,56 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
-inherit python-single-r1
+inherit cmake multilib prefix python-r1 python-utils-r1
 
-DESCRIPTION="ROCm System Management Interface"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROC-smi"
+DESCRIPTION="ROCm System Management Interface Library"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib"
 
 if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROC-smi"
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib"
 	EGIT_BRANCH="master"
 else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROC-smi/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz"
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/ROC-smi-rocm-${PV}"
+	S="${WORKDIR}/rocm_smi_lib-rocm-${PV}"
 fi
 
-LICENSE="MIT"
-SLOT="0"
+LICENSE="NCSA-AMD"
+SLOT="0/$(ver_cut 1-2)"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND=""
 RDEPEND="${PYTHON_DEPS}"
+BDEPEND=""
+
+src_prepare() {
+	sed -e "/DESTINATION/s,\${OAM_NAME}/lib,$(get_libdir)," \
+		-e "/DESTINATION/s,oam/include/oam,include/oam," -i oam/CMakeLists.txt || die
+	sed -e "/link DESTINATION/,+1d" \
+		-e "/DESTINATION/s,\${ROCM_SMI}/lib,$(get_libdir)," \
+		-e "/bindings_link/,+3d" \
+		-e "/rsmiBindings.py/,+1d" \
+		-e "/DESTINATION/s,rocm_smi/include/rocm_smi,include/rocm_smi," -i rocm_smi/CMakeLists.txt || die
+	sed -e "/LICENSE.txt/d" -e "s,\${ROCM_SMI}/lib/cmake,$(get_libdir)/cmake,g" -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
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+}
 
 src_install() {
-	python_scriptinto /usr/bin
-	python_newscript rocm_smi.py rocm-smi
+	cmake_src_install
+	python_foreach_impl python_newexe python_smi_tools/rocm_smi.py rocm-smi
+	python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py
 }