From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 689F815808E for ; Sun, 24 Apr 2022 22:36:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9120E0937; Sun, 24 Apr 2022 22:35:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 15D4AE0942 for ; Sun, 24 Apr 2022 22:35:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A95273411EF for ; Sun, 24 Apr 2022 22:35:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C6A2D42C for ; Sun, 24 Apr 2022 22:35:36 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1650839710.7b6c0d7a36f0dff1904de9753b61d1c83a79ff67.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/opencl-clang/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/opencl-clang/opencl-clang-13.0.0-r1.ebuild dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild X-VCS-Directories: dev-libs/opencl-clang/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 7b6c0d7a36f0dff1904de9753b61d1c83a79ff67 X-VCS-Branch: master Date: Sun, 24 Apr 2022 22:35:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eb5d4b30-de83-4963-a567-5c65debd89a4 X-Archives-Hash: 565d279e8b000b0c820d376879762d42 commit: 7b6c0d7a36f0dff1904de9753b61d1c83a79ff67 Author: Conrad Kostecki gentoo org> AuthorDate: Sun Apr 24 22:20:13 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sun Apr 24 22:35:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b6c0d7a dev-libs/opencl-clang: drop multilib, EAPI 7 -> 8 Since no packages depend on multilib, we can drop it. Signed-off-by: Conrad Kostecki gentoo.org> ...g-13.0.0.ebuild => opencl-clang-13.0.0-r1.ebuild} | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-13.0.0-r1.ebuild similarity index 70% rename from dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild rename to dev-libs/opencl-clang/opencl-clang-13.0.0-r1.ebuild index ae4242b3e576..a46a92527df9 100644 --- a/dev-libs/opencl-clang/opencl-clang-13.0.0.ebuild +++ b/dev-libs/opencl-clang/opencl-clang-13.0.0-r1.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -CMAKE_ECLASS=cmake +LLVM_MAX_SLOT="13" -inherit cmake-multilib llvm +inherit cmake llvm DESCRIPTION="OpenCL-oriented thin wrapper library around clang" HOMEPAGE="https://github.com/intel/opencl-clang" @@ -16,14 +16,13 @@ LICENSE="UoI-NCSA" SLOT="13" KEYWORDS="amd64" -DEPEND=" - >=dev-util/spirv-llvm-translator-13.0.0:13=[${MULTILIB_USEDEP}] - >=sys-devel/clang-13.0.0:13=[static-analyzer,${MULTILIB_USEDEP}] - sys-devel/llvm:13=[${MULTILIB_USEDEP}] +RDEPEND=" + dev-util/spirv-llvm-translator:${SLOT}= + sys-devel/clang:${SLOT}=[static-analyzer] + sys-devel/llvm:${SLOT}= " -RDEPEND="${DEPEND}" -LLVM_MAX_SLOT=13 +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-8.0.0-clang_library_dir.patch @@ -31,10 +30,11 @@ PATCHES=( "${FILESDIR}"/${PN}-13.0.0_version.patch ) -multilib_src_configure() { +src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})" -DCLANG_LIBRARY_DIRS="${EPREFIX}"/usr/lib/clang ) + cmake_src_configure }