*/*: Switch candrews' packages to cmake.eclass

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

12 files changed, 24 insertions, 38 deletions

diff --git a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild
index f2c70a5e3612..d777625e0367 100644
--- a/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild
+++ b/dev-libs/rapidjson/rapidjson-1.1.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API"
 HOMEPAGE="https://rapidjson.org/"
@@ -35,7 +35,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e 's|-Werror||g' CMakeLists.txt || die
 	sed -i -e 's|-Werror||g' example/CMakeLists.txt || die
@@ -50,5 +50,5 @@ src_configure() {
 		-DRAPIDJSON_BUILD_TESTS=$(usex test)
 		-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/rapidjson/rapidjson-9999.ebuild b/dev-libs/rapidjson/rapidjson-9999.ebuild
index 34b5854db22c..c8f3d6d0ff7d 100644
--- a/dev-libs/rapidjson/rapidjson-9999.ebuild
+++ b/dev-libs/rapidjson/rapidjson-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A fast JSON parser/generator for C++ with both SAX/DOM style API"
 HOMEPAGE="https://rapidjson.org/"
@@ -32,7 +32,7 @@ DEPEND="
 RDEPEND=""
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	sed -i -e 's|-Werror||g' CMakeLists.txt || die
 	sed -i -e 's|-Werror||g' example/CMakeLists.txt || die
@@ -47,5 +47,5 @@ src_configure() {
 		-DRAPIDJSON_BUILD_TESTS=$(usex test)
 		-DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild
index ff0ede91ae21..ca7dc037fe3d 100644
--- a/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild
+++ b/dev-libs/rocm-comgr/rocm-comgr-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
@@ -30,13 +30,12 @@ RDEPEND=">=dev-libs/rocm-device-libs-${PV}
 DEPEND="${RDEPEND}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-3.0.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-3.0.0.ebuild
index e0264de7479c..92ef9a203b00 100644
--- a/dev-libs/rocm-device-libs/rocm-device-libs-3.0.0.ebuild
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
@@ -28,7 +28,6 @@ DEPEND="${RDEPEND}"
 src_configure() {
 	local mycmakeargs=(
 		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
index 91d53a41976d..6a15eba4feea 100644
--- a/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
@@ -28,7 +28,6 @@ DEPEND="${RDEPEND}"
 src_configure() {
 	local mycmakeargs=(
 		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild b/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
index 848a8f3a5408..d758811b4785 100644
--- a/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
+++ b/dev-libs/rocm-hostcall/rocm-hostcall-2.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
@@ -25,10 +25,3 @@ SLOT="0/$(ver_cut 1-2)"
 
 RDEPEND="dev-libs/rocr-runtime"
 DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild
index 7d1b111fda23..1afe25e122a5 100644
--- a/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild
+++ b/dev-libs/rocm-opencl-driver/rocm-opencl-driver-2.10.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Driver/"
@@ -30,13 +30,12 @@ src_prepare() {
 	# remove unittest, because it downloads additional file from github.com
 	sed -e "s:add_subdirectory(src/unittest):#add_subdirectory(src/unittest):" -i CMakeLists.txt || die
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
index b57b49b69659..74ef3eeac923 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 OPENCL_ICD_COMMIT="6c03f8b58fafd9dd693eaac826749a5cfad515f8"
 SRC_URI="https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/${OPENCL_ICD_COMMIT}.tar.gz -> OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}.tar.gz"
@@ -44,7 +44,7 @@ src_prepare() {
 	mkdir -p "${S}"/api/opencl/khronos/ || die
 	mv "${WORKDIR}/OpenCL-ICD-Loader-${OPENCL_ICD_COMMIT}" "${S}"/api/opencl/khronos/icd || die
 	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -52,7 +52,6 @@ src_configure() {
 		-DUSE_COMGR_LIBRARY=yes
 		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/"
 		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang/"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
index a0096a72495c..8e95ac72ed0e 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
@@ -33,5 +33,5 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
index 6a89ca2901eb..cc439a3d6b68 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
@@ -30,5 +30,5 @@ DEPEND="${COMMON_DEPEND}
 
 src_prepare() {
 	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.0.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.0.0.ebuild
index f3191cff1c27..e67d364f42fb 100644
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.0.0.ebuild
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.0.0.ebuild
@@ -30,7 +30,6 @@ src_prepare() {
 }
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
 	)
 	cmake_src_configure
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
index f3191cff1c27..e67d364f42fb 100644
--- a/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-9999.ebuild
@@ -30,7 +30,6 @@ src_prepare() {
 }
 src_configure() {
 	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/"
 		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
 	)
 	cmake_src_configure