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 F3948158064 for ; Sun, 5 May 2024 09:26:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41F3C2BC01A; Sun, 5 May 2024 09:26:39 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 276BE2BC01A for ; Sun, 5 May 2024 09:26:39 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 680B2343115 for ; Sun, 5 May 2024 09:26:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BDCF193E for ; Sun, 5 May 2024 09:26:36 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1714901178.1256a483f24cebcb72afa419436f1ec6d8bc3916.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/onnx/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/onnx/onnx-1.15.0-r2.ebuild sci-libs/onnx/onnx-1.15.0-r3.ebuild X-VCS-Directories: sci-libs/onnx/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: 1256a483f24cebcb72afa419436f1ec6d8bc3916 X-VCS-Branch: master Date: Sun, 5 May 2024 09:26: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: f78d5b5c-b233-4d0f-bf45-d049f07f0af6 X-Archives-Hash: dd9eac70b9e6a72a3bc9748d32cd96f8 commit: 1256a483f24cebcb72afa419436f1ec6d8bc3916 Author: Alfredo Tupone gentoo org> AuthorDate: Sun May 5 09:24:45 2024 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Sun May 5 09:26:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1256a483 sci-libs/onnx: require python always Closes: https://bugs.gentoo.org/931229 Signed-off-by: Alfredo Tupone gentoo.org> ...onnx-1.15.0-r2.ebuild => onnx-1.15.0-r3.ebuild} | 45 ++++++++++++---------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/sci-libs/onnx/onnx-1.15.0-r2.ebuild b/sci-libs/onnx/onnx-1.15.0-r3.ebuild similarity index 62% rename from sci-libs/onnx/onnx-1.15.0-r2.ebuild rename to sci-libs/onnx/onnx-1.15.0-r3.ebuild index 63e8ab1695e9..cd9731d69130 100644 --- a/sci-libs/onnx/onnx-1.15.0-r2.ebuild +++ b/sci-libs/onnx/onnx-1.15.0-r3.ebuild @@ -3,7 +3,6 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -DISTUTILS_OPTIONAL=1 DISTUTILS_EXT=1 PYTHON_COMPAT=( python3_{9..12} ) inherit distutils-r1 cmake @@ -16,47 +15,53 @@ SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~riscv" -IUSE="python" RESTRICT="test" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" - python? ( - ${PYTHON_DEPS} - dev-python/protobuf-python[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - ) + dev-python/protobuf-python[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] dev-libs/protobuf:= " DEPEND="${RDEPEND}" -BDEPEND="python? ( - ${DISTUTILS_DEPS} -)" - -PATCHES=( "${FILESDIR}"/${P}-hidden.patch ) - src_prepare() { + eapply "${FILESDIR}"/${P}-hidden.patch cmake_src_prepare - use python && distutils-r1_src_prepare + distutils-r1_src_prepare } -src_configure() { +python_configure_all() +{ mycmakeargs=( -DONNX_USE_PROTOBUF_SHARED_LIBS=ON -DONNX_USE_LITE_PROTO=ON -DONNX_BUILD_SHARED_LIBS=ON ) cmake_src_configure - use python && distutils-r1_src_configure +} + +src_configure() { + distutils-r1_src_configure } src_compile() { + mycmakeargs=( + -DONNX_USE_PROTOBUF_SHARED_LIBS=ON + -DONNX_USE_LITE_PROTO=ON + -DONNX_BUILD_SHARED_LIBS=ON + ) + CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile +} + +python_compile_all() { cmake_src_compile - use python && CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile } -src_install() { +python_install_all() { cmake_src_install - use python && distutils-r1_src_install + distutils-r1_python_install_all +} + +src_install() { + distutils-r1_src_install }