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

3 files changed, 6 insertions, 164 deletions

diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index e17c2ec9074e..9779389a02c6 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -9,7 +9,7 @@ DIST rocclr-5.3.3.tar.gz 625944 BLAKE2B 0cdbc1415a355e1d56628834846aaa8587c9827e
 DIST rocclr-5.4.3.tar.gz 640557 BLAKE2B 9ab91bab7ffb06c9c0d1c2ae79533fccc597071dda289ac375e32eb2965c638a7029951d2a49d46eeead9d7d242fe3a0cedb3e444d877af1bbf0e2d801c91e11 SHA512 c1d1a2ca08c2d762a221c04d394469aa7aff46086151333b145e0db9a7c7eb3dbbf8b9693e50d816aa9a13c16b4ebacf5ff3d5d8ff3393a8a764728ef5172d3a
 DIST rocclr-5.5.1.tar.gz 634330 BLAKE2B e6383a6b6b09f274a944d66effd345e38a191ec73ee5c5240f8ec8bb62a4df97b80835ce57f8f78c3834602b9da425b49289b5c7cd7e4c7071147ff409c6a6c9 SHA512 4c12011d22a4f14d9e93250b2a38716eb973139afa1adbbbd51c0e0ed13c0b7c1f45a37c71ef937c5fdabf09e928d7913ca3332fc61b7a2c10d21421306a228f
 DIST rocm-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965
-DIST rocm-clr-6.0.0.tar.gz 1983453 BLAKE2B 2cf6ec7c3b0ec5dedeea94ff54af30662b781fc2eee22e3315094af61dc9d331eba33c1d9d463295848c5724e515a3137f9b189c1261273afad1a5f9d32226c2 SHA512 12e77a121150d8c25121b98bd7c6233c2568f9f4130bdbe6bc3ab225f14b8bea6a6bdc4ed497c0f999d3d3daabdca0de8caaa1b69911c11974b5d6f951734433
+DIST rocm-clr-6.1.1.tar.gz 2031034 BLAKE2B b0485bb015d31986f4988d1db0c029c826856e50b5bb1b58fac2097c14b3966668f1b8d41ec198889e27ac860497a8b3c081ec31d52390d5c9ff5db092bf7cce SHA512 86925e8b9a9e77b06a57daefbc7279887b4ef7c6a79c3717bc2f2d3bf29926281c60063fd17e21c65d7def520d9f579bf88f69051d053a38750ba968f69ca3fc
 DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0
 DIST rocm-opencl-runtime-5.3.3.tar.gz 1007773 BLAKE2B a3f600a68183337f92b152a123241cb7025889cca2ef6814d9d5b5a2146a78703b171d20bcb432bc7a2cdd1f24ad349408c17816b25a66702e9f0f5345af9082 SHA512 391f0f244b7f02972df8cada821e69ee8d81d96b9cff3c14f1d0838da583d8fb136ec4bd5ee820f6dd261968e9eef5e9a5b10b7bb76b1b64625c399d79bcb03f
 DIST rocm-opencl-runtime-5.4.3.tar.gz 1005268 BLAKE2B f9398e4c2b0f045f1b5d8df9f31b7f2bef6a9201885aa6ee5fc5d71632cfde26a078d9a5ea38c3da12d3c187faf04c7bdcf1a8ecb9927cdba56b1efdfcdc44ee SHA512 f65d4622ce8721a6b91ab5b5b306d142ba507d3e631ac3ab0b76c5bc6d8d18455e02debd954c82e7eb609f232b509f1ec1a013dc2fad467c2c2ad31fdf15755d
@@ -19,6 +19,5 @@ EBUILD rocm-opencl-runtime-5.3.3-r1.ebuild 3630 BLAKE2B cdafd2367c4b222a43b434e8
 EBUILD rocm-opencl-runtime-5.4.3-r1.ebuild 4031 BLAKE2B c952245f6f6ad1910facd33a82d25b77f2b20cbbdf4c05ca7ce735ab913fc49bdc5cdc1e8fc7f944cc5574331305e2d96cbb9bccd17a7ec28c042d9bec91499c SHA512 2cf80ae9fa5dba61936216fe87274998deefa70d0f20613ad0bf048e29f35eb37f525f1682024a85ab4a4acd79b8d75ad586008c5032dc527b293e79d3bc6a01
 EBUILD rocm-opencl-runtime-5.5.1.ebuild 4002 BLAKE2B e784debbe6ca533290ca801cf965087e7e01d39c84a65ad2a738a672f3d330c7a28cc13fd5a8d6cbcc9520c9543cce9b762d480b6f3f4173006301c293af013b SHA512 38940e4b6d028fc8e713ec1641824776d0fab540f3e9e3011f6b377caf82a9b4d13ccd897605c01557975c1ec4f89285e944cee6b67bdbe56ddc300284d2df55
 EBUILD rocm-opencl-runtime-5.7.1-r1.ebuild 3119 BLAKE2B 672082b1bea0f6cd45f8c37181e731d60dec3844fa0a31aca555b7c6e154d4981d33d1140fc83b3f8c6fbc46b7a13b88c76278ea0c04463eb0f2b398a60b3bbf SHA512 7d12f85d62bfb48df3f7c0d705e5411dad21ffa71964f19b09f2623aa836ecd91fedb28ad1ee5790ca5c538139e6790b2154c66dccc67687decdd3fb62d92b18
-EBUILD rocm-opencl-runtime-6.0.0.ebuild 3119 BLAKE2B 272dfd88268d3457367bf9f19e4622949ceb41b1f20c9504545e1638331ece944aaec9b4eb60f9afd1bbdd409252be70d291fbccd351c2296dbaf08a7094201a SHA512 3cedae3db98286f85dcdb3db35bdfcc7f6ac8702471d4cd7115bc6672a2623924a0aba6fec1e528fb184b91e1bad99dfa6511739c54ebc7699be76f5563c756e
-EBUILD rocm-opencl-runtime-9999.ebuild 4098 BLAKE2B dbeebfc8fe71bb84507cb8f021deda11c4d3027ed4f21f4bed3f92c732e5d7122a44a42e4d25c8b2df59ec94a825654d508ca3f02559827ab1db2472b6240c9c SHA512 8ede58974bf967eb569621aed33dbc0d974247059818f72195affb645ca1d8e642f6605eaeb345604c0376df9eabe84402cc5d1e8e53feb74c7d8d337fa44579
+EBUILD rocm-opencl-runtime-6.1.1.ebuild 2695 BLAKE2B 2e2241518863f36222e755d61f8e5c25510c5a5250458fce110d5830898a36ae3e97a20fce61382d7ebf39346dee705b673dd0c1e4390e3ee44f7c23eff4d1b7 SHA512 edfb87e56c042000e41480771186a8e536e35a58cb2e57ef71f3d118501dcc85eb1025eba6a6af0b25d9c896329aa832d56f9b1037031c4279e5f21367dfa81b
 MISC metadata.xml 525 BLAKE2B 9af34c6be2bb5ff304e4d01810b810eb8a0639d1972325fad3b81c93aa4d060cbebddc9c06da702dd80f9aa98549720cf2bc674d5b11ef6f99ed30efe50d2110 SHA512 c50670dde49ec0d9d3acca19d37842ecf567429f455e1b37c5181e5d4361d829eff0980ba35096ef42c0789f8904d52425faf4a2aabf641142722957b626378d
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.1.ebuild
index b6912994ddb7..465e3a2ddc66 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.0.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.1.ebuild
@@ -9,19 +9,12 @@ inherit cmake edo flag-o-matic rocm
 DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
 HOMEPAGE="https://github.com/ROCm-Developer-Tools/clr"
 
-#if [[ ${PV} == *9999 ]] ; then
-#	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-#	EGIT_CLR_REPO_URI="https://github.com/ROCm-Developer-Tools/ROCclr"
-#	inherit git-r3
-#	S="${WORKDIR}/${P}"
-#else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz"
-	S="${WORKDIR}/clr-rocm-${PV}/"
-#fi
+SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz"
+S="${WORKDIR}/clr-rocm-${PV}/"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
@@ -34,18 +27,7 @@ DEPEND="${RDEPEND}"
 BDEPEND=">=dev-build/rocm-cmake-5.3
 	media-libs/glew
 	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
-	"
-
-src_unpack () {
-if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-OB		git-r3_checkout
-		git-r3_fetch "${EGIT_CLR_REPO_URI}"
-		git-r3_checkout "${EGIT_CLR_REPO_URI}" "${CLR_S}"
-	else
-		default
-	fi
-}
+"
 
 src_configure() {
 	# -Werror=strict-aliasing
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-9999.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-9999.ebuild
deleted file mode 100644
index 1ca30c8a10ae..000000000000
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-9999.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake edo flag-o-matic
-
-DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
-	EGIT_CLR_REPO_URI="https://github.com/ROCm-Developer-Tools/ROCclr"
-	inherit git-r3
-	S="${WORKDIR}/${P}"
-else
-	SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz
-	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
-	S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
-fi
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-libs/rocr-runtime-5.3
-	>=dev-libs/rocm-comgr-5.3
-	>=dev-libs/rocm-device-libs-5.3
-	>=virtual/opencl-3
-	media-libs/mesa[-opencl]"
-DEPEND="${RDEPEND}
-	dev-util/opencl-headers"
-BDEPEND=">=dev-build/rocm-cmake-5.3
-	media-libs/glew
-	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
-	"
-
-CLR_S="${WORKDIR}/ROCclr-rocm-${PV}"
-
-src_unpack () {
-if [[ ${PV} == "9999" ]]; then
-		git-r3_fetch
-		git-r3_checkout
-		git-r3_fetch "${EGIT_CLR_REPO_URI}"
-		git-r3_checkout "${EGIT_CLR_REPO_URI}" "${CLR_S}"
-	else
-		default
-	fi
-}
-src_prepare() {
-	cmake_src_prepare
-
-	pushd ${CLR_S} || die
-	# Bug #753377
-	# patch re-enables accidentally disabled gfx800 family
-	eapply "${FILESDIR}/${PN}-5.0.2-enable-gfx800.patch"
-	popd || die
-}
-
-src_configure() {
-	# -Werror=strict-aliasing
-	# https://bugs.gentoo.org/856088
-	# https://github.com/ROCm/clr/issues/64
-	#
-	# Do not trust it for LTO either
-	append-flags -fno-strict-aliasing
-	filter-lto
-
-	# Fix ld.lld linker error: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/155
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
-	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
-	append-cflags -fcommon
-
-	local mycmakeargs=(
-		-Wno-dev
-		-DROCCLR_PATH="${CLR_S}"
-		-DAMD_OPENCL_PATH="${S}"
-		-DROCM_PATH="${EPREFIX}/usr"
-		-DBUILD_TESTS=$(usex test ON OFF)
-		-DEMU_ENV=ON
-		-DBUILD_ICD=OFF
-		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	insinto /etc/OpenCL/vendors
-	doins config/amdocl64.icd
-
-	cd "${BUILD_DIR}" || die
-	insinto /usr/lib64
-	doins amdocl/libamdocl64.so
-	doins tools/cltrace/libcltrace.so
-}
-
-# Copied from rocm.eclass. This ebuild does not need amdgpu_targets
-# USE_EXPANDS, so it should not inherit rocm.eclass; it only uses the
-# check_amdgpu function in src_test. Rename it to check-amdgpu to avoid
-# pkgcheck warning.
-check-amdgpu() {
-	for device in /dev/kfd /dev/dri/render*; do
-		addwrite ${device}
-		if [[ ! -r ${device} || ! -w ${device} ]]; then
-			eerror "Cannot read or write ${device}!"
-			eerror "Make sure it is present and check the permission."
-			ewarn "By default render group have access to it. Check if portage user is in render group."
-			die "${device} inaccessible"
-		fi
-	done
-}
-
-src_test() {
-	check-amdgpu
-	cd "${BUILD_DIR}"/tests/ocltst || die
-	export OCL_ICD_FILENAMES="${BUILD_DIR}"/amdocl/libamdocl64.so
-	local instruction1="Please start an X server using amdgpu driver (not Xvfb!),"
-	local instruction2="and export OCLGL_DISPLAY=\${DISPLAY} OCLGL_XAUTHORITY=\${XAUTHORITY} before reruning the test."
-	if [[ -n ${OCLGL_DISPLAY+x} ]]; then
-		export DISPLAY=${OCLGL_DISPLAY}
-		export XAUTHORITY=${OCLGL_XAUTHORITY}
-		ebegin "Running oclgl test under DISPLAY ${OCLGL_DISPLAY}"
-		if ! glxinfo | grep "OpenGL vendor string: AMD"; then
-			ewarn "${instruction1}"
-			ewarn "${instruction2}"
-			die "This display does not have AMD OpenGL vendor!"
-		fi
-		./ocltst -m $(realpath liboclgl.so) -A ogl.exclude
-		eend $? || die "oclgl test failed"
-	else
-		ewarn "${instruction1}"
-		ewarn "${instruction2}"
-		die "\${OCLGL_DISPLAY} not set."
-	fi
-	edob ./ocltst -m $(realpath liboclruntime.so) -A oclruntime.exclude
-	edob ./ocltst -m $(realpath liboclperf.so) -A oclperf.exclude
-}