[gentoo-commits] repo/gentoo:master commit in: dev-util/spirv-llvm-translator/

["Conrad Kostecki" <conikost@gentoo.org>]

commit:     03ff4399ae8614be64b1493acc308ec5e0c1eb71
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 22:30:53 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 22:35:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03ff4399

dev-util/spirv-llvm-translator: drop multilib, EAPI 7 -> 8

Since no packages depend anymore on multilib, we can drop it.

Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 ...uild => spirv-llvm-translator-13.0.0-r1.ebuild} | 39 +++++++++++-----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0-r1.ebuild
similarity index 66%
rename from dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0.ebuild
rename to dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0-r1.ebuild
index a41864baa0e2..f131b89cb086 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-13.0.0-r1.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-CMAKE_ECLASS=cmake
-
-inherit cmake-multilib flag-o-matic llvm
+EAPI=8
 
+LLVM_MAX_SLOT="13"
 MY_PN="SPIRV-LLVM-Translator"
 MY_P="${MY_PN}-${PV}"
 
+inherit cmake flag-o-matic llvm
+
 DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
 HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
 SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -17,42 +16,42 @@ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-rename-O
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
+SLOT="13"
 KEYWORDS="amd64"
 IUSE="test +tools"
-
 REQUIRED_USE="test? ( tools )"
 RESTRICT="!test? ( test )"
 
-RDEPEND="sys-devel/clang:${SLOT}=[${MULTILIB_USEDEP}]
-	dev-util/spirv-headers"
+RDEPEND="
+	dev-util/spirv-headers
+	sys-devel/llvm:${SLOT}
+"
+
 DEPEND="${RDEPEND}"
-BDEPEND="test? ( dev-python/lit )"
 
-LLVM_MAX_SLOT="${SLOT}"
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-python/lit )
+"
 
-PATCHES=(
-	"${WORKDIR}"/${P}-rename-OpConstFunctionPointerINTEL.patch
-)
+PATCHES=( "${WORKDIR}"/${P}-rename-OpConstFunctionPointerINTEL.patch )
 
 src_prepare() {
 	append-flags -fPIC
 	cmake_src_prepare
 }
 
-multilib_src_configure() {
+src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
 		-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR="${BROOT}/usr/include/spirv"
 		-DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
 		-DLLVM_SPIRV_INCLUDE_TESTS=$(usex test "ON" "OFF")
 	)
+
 	cmake_src_configure
 }
 
-multilib_src_test() {
-	# Some tests fail on amd64 when ABI==x86
-	if multilib_is_native_abi; then
-		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
-	fi
+src_test() {
+	lit "${BUILD_DIR}/test" || die
 }