gentoo resync : 29.12.2022

4 files changed, 3 insertions, 58 deletions

diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index d2909d74cd97..24a958f4755f 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,6 +1,6 @@
 AUX rocr-runtime-3.7.0-cmake-install-paths.patch 4032 BLAKE2B a4252fc7a6740c64a5695ccecc6392f31acf9a341b9886fab37686916c6d0298da8ccd8d723710aaa944f6e2c26afba9b3f0bae84d5a755bf87dc8700c3dd598 SHA512 d29bf929a136dc4f6b0ddc6f2821a3ad73ab31e1c7a265e73344d69712cbe18a0a2a200d23b094fcfdddbcd37275a75d7d6313d163a6994d323a7b7f611a0d75
 AUX rocr-runtime-4.1.0-cmake-install-paths.patch 4031 BLAKE2B 144df57dc9fa014779d6490217ded97511228d88a7e8864e4eea2870f8b48ec361b4a16ca5e3571ed27a1f91e32d07d694d93c3a2075c60af626c57112ae4e86 SHA512 28f6b3db96df74ede81219005d5d62194f2d41b0628de92202a4293983384390e68c9da1005af86b2b2d2f19f1de6fc2ca4ac1f4dcf9358f66ca519c894f2043
-AUX rocr-runtime-4.3.0_no-sqlprofiler.patch 1084 BLAKE2B dfc2b9bbea0360fdbbd04988f0dbed76e53d8d9f9d2a5217f154e02e39f7b78f3408edb0204a93b6b4e927103b2c041788bd6befb8475d3f4e333bdc6ad19a0d SHA512 f90b92eb547640bc8cf71d042f12a55504371e4c3e624b02435c026e7ae9d5885e23a2be3a0f5c443fc502b3a1c8a03fdb5efabaeaabe8be33a28aab3ac9d9ca
+AUX rocr-runtime-4.3.0_no-aqlprofiler.patch 1084 BLAKE2B dfc2b9bbea0360fdbbd04988f0dbed76e53d8d9f9d2a5217f154e02e39f7b78f3408edb0204a93b6b4e927103b2c041788bd6befb8475d3f4e333bdc6ad19a0d SHA512 f90b92eb547640bc8cf71d042f12a55504371e4c3e624b02435c026e7ae9d5885e23a2be3a0f5c443fc502b3a1c8a03fdb5efabaeaabe8be33a28aab3ac9d9ca
 AUX rocr-runtime-4.5.2-cmake-install-paths.patch 2683 BLAKE2B 9f4c3e232e81e7544e77c7388c5f555bd564e4806814d40012820023c4293242bdbbcafb788141e437fdfa6a3269d241710d74587492a657cc80fcb8f9cb29e4 SHA512 62165ed65c9d26194bbd4c3a9e1dae6d0ce2b8d61a6d421d5800e2a9a885e94cde648290090cc3654bf8b4a4c5263899c52e556d1d42e08d6d75f4bf00860928
 AUX rocr-runtime-5.0.1-cmake-install-paths.patch 2744 BLAKE2B fbbecdefbfabcbe4cd7f029e10d6abed94b492f94157839336adf83e98efe5c0e93dbb20856ca6adab32cb315bbd7b6c397c8fc48b66ea784cdbb3becb5f718e SHA512 db7ee8b87b526991a62c3cbfd385e85d27e05ba9a7f4726e8060d7ad29917e154bdcd0715e61a08210dad4b6112c731dfcab9e9f7e809b74da2f74c62a1eab72
 DIST rocr-runtime-3.10.0.tar.gz 691857 BLAKE2B 68403081180fe1aead570f8055f91d13083516766afe6c9fd18d7619162cc12fa6dd0ec824ffdc44832d1ab7e823ac2cc399b7cbb4e603f95db54e492de152c5 SHA512 9ca7c7a22ea2a35437aa1a23a331c36684ada1af0f389f697bd6c1e35c4f9493b851d7e7176a0892be36d3d7de93000f7db37e3d2c109fa6c1932851c3bd703b
@@ -18,8 +18,7 @@ EBUILD rocr-runtime-3.9.0.ebuild 1510 BLAKE2B 196532ca9cb64ff2963ab08f06884eeb37
 EBUILD rocr-runtime-4.0.0.ebuild 1530 BLAKE2B 065d3d28d95d8832f8630496e023b264b28e25f7a99d253be765251047472a3bd4364cb0bedce6b7025221e3b6e92ed1964713884f08bd595017597e8b904bba SHA512 099d1810b5ea7d2fce49e4914b0f4453fd7c202dcee62a2e83875f7e0b47e59c6741e6c21a648f422b6d4c28aa5ccd18d6aa93a6b32d10705b6fac4f5aa68151
 EBUILD rocr-runtime-4.1.0.ebuild 1648 BLAKE2B 6e654ed96e97b9a60e25db92eb8ab80ace4d773dc7c4082adffc805f20dff9ea8b0b139e421df625a99764f1b61d22700864e25296011848bb91f8025b373362 SHA512 abc3ab62999a8e3bb6c6d0616e528b3e2c3914a67e1b40548d71ff31a409ed53f81dfb2c9e0dfdfa23e9d5ae8ca4f092d575bb003acef8695d373dd7fca36c01
 EBUILD rocr-runtime-4.2.0.ebuild 1502 BLAKE2B 6f7d48bc7bcc89ae585b202ad2bd4b523142fec9d00418efa297248548867bd02ddff6812fb01572d03bdb70438837437d777384a78e706d1eb420a12d61eae7 SHA512 df94dcb2549a9da7048b7a9d22ec4c4e5a617b85e95d0f5d576a770ee5f1ac3d1a71504e9b1a92752904568cf1dd11ec0fd8a35b11d17d8329c07dd0aae762fc
-EBUILD rocr-runtime-4.3.0.ebuild 1471 BLAKE2B da97efe7c43ae47cb314a285fe6ba4cc970c0f166460cf09fcee567b15d378042603fc8f37ccc6b71d5d8daf9629b340aaf4a5e9c8a4c2fbecba1a26b8eac13f SHA512 46f6a6d34dba469a8aee43d2c543347f9bb43433871cb34c5a21a520de2fa1a78b1e3cf58e9fcedc157674c1c96a31bd04afff1b7d7d6289ae98d283774c9742
+EBUILD rocr-runtime-4.3.0.ebuild 1459 BLAKE2B c9542e8686afc2718d468b363ed926547cc32cd2389c344b6e3c621bd3c1007239f6e9434df645054daccdfcd78f4ddcc8a78156019e4c604a7ee8a88866a28d SHA512 74e81b3beed9e9d564f3ce006b235c60b546adc60701303c3f95e36fb00f4b81b8fbfc4867a3740b4ec368052e68f4eca4b4847f97d858fdf72c5fffa8669625
 EBUILD rocr-runtime-4.5.2.ebuild 1414 BLAKE2B 0c0e4b7d3e1d643e5fda6d3636789811e6a10dc3e990a84900643c0fbae667b2f9ce0dec2c79b801b2730acf83a5ba7de025bab6b0b353363d177891f2884591 SHA512 a1967d10a99f3dfa250f9cec2a244b5e670c80a0c895ee92a0feee00f600428ee7037465ec09b99b15437158c9f69d14d2bfa249cd5dfab7689015c43468b924
 EBUILD rocr-runtime-5.0.2.ebuild 1378 BLAKE2B 31699837b204a3e5b21a237b20f89d766f195f235dade08a194a1a3be9eb60a4c17ea013595bdfc5aca1faac9ea4cde8022887f4787fffad98ccfa9844184eab SHA512 f23c922627b50b0ad5c6482d3b9022390ad8715bf4f39e6317faec73c9b0e1416caae7f4e4828319c7873537db117690b1b567c575faf3b2e993fdcce122cfdf
-EBUILD rocr-runtime-9999.ebuild 1628 BLAKE2B 16ac148adea537c587db359add7d324183b6ec4039f59d1c81905db332d37a225e84e5cd0f7b370f994637eda0698535263e61d3ff62896f5c232e7fc1d11e95 SHA512 2cd282faa8ef6417029ff002d75ac2c7fcff602239b82246496daaeb587b663399ec9e4250ed3f5dd922318f1ff83aa36448e3481766661602a3ac283494a199
 MISC metadata.xml 515 BLAKE2B ccb566413bfb5e7027d1596b040f6c957dc8d58fc413859c4a08fbd484ab16d536948bcf24cdd1edd5bdc8a4951b5abe6adbb3da6fde37e5a9ba1bdcfd312827 SHA512 6d0f0ab69b8f04a9106d71003f17c00e693b42c03aa5c430ebb03f7ffb3ecb8f4b10128fd22462692b97870c23e85aa3f037433fa65c55a342d64038f0db5a93
diff --git a/dev-libs/rocr-runtime/files/rocr-runtime-4.3.0_no-sqlprofiler.patch b/dev-libs/rocr-runtime/files/rocr-runtime-4.3.0_no-aqlprofiler.patch
index fdb34b75b2d2..fdb34b75b2d2 100644
--- a/dev-libs/rocr-runtime/files/rocr-runtime-4.3.0_no-sqlprofiler.patch
+++ b/dev-libs/rocr-runtime/files/rocr-runtime-4.3.0_no-aqlprofiler.patch
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild
index 2be1fb23feb6..fc1b4b73bd0a 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-4.3.0.ebuild
@@ -19,6 +19,7 @@ DESCRIPTION="Radeon Open Compute Runtime"
 HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
 PATCHES=(
 	"${FILESDIR}/${PN}-4.1.0-cmake-install-paths.patch"
+	"${FILESDIR}/${PN}-4.3.0_no-aqlprofiler.patch"
 )
 
 LICENSE="MIT"
@@ -33,8 +34,6 @@ DEPEND="${COMMON_DEPEND}
 BDEPEND="app-editors/vim-core"
 	# vim-core is needed for "xxd"
 
-PATCHES=( "${FILESDIR}"/${PN}-4.3.0_no-sqlprofiler.patch )
-
 src_prepare() {
 	# ... otherwise system llvm/clang is used ...
 	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS ${EPREFIX}/usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
deleted file mode 100644
index 38fc7decb01f..000000000000
--- a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
-	inherit git-r3
-	S="${WORKDIR}/${P}/src"
-else
-	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Radeon Open Compute Runtime"
-HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.0-cmake-install-paths.patch"
-)
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="debug"
-
-COMMON_DEPEND="sys-process/numactl
-	dev-libs/elfutils:=
-	>=sys-devel/llvm-roc-${PV}"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/roct-thunk-interface-${PV}
-	>=dev-libs/rocm-device-libs-${PV}"
-BDEPEND="app-editors/vim-core"
-	# vim-core is needed for "xxd"
-
-src_prepare() {
-	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-
-	# ... otherwise system llvm/clang is used ...
-	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
-
-	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
-	sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	use debug || local mycmakeargs=(-DCMAKE_CXX_FLAGS='-DNDEBUG')
-	cmake_src_configure
-}