gentoo auto-resync : 01:11:2023 - 21:50:29

3 files changed, 60 insertions, 33 deletions

diff --git a/sci-libs/onnx/Manifest b/sci-libs/onnx/Manifest
index 7c0b8f3a9d08..ce4cd495b1af 100644
--- a/sci-libs/onnx/Manifest
+++ b/sci-libs/onnx/Manifest
@@ -6,5 +6,5 @@ DIST onnx-1.14.0.tar.gz 11568979 BLAKE2B 9aed36489f0bbe0a96f2a7d3f44b70d228a7ec1
 EBUILD onnx-1.11.0-r2.ebuild 822 BLAKE2B bd238d6e73ec27dee4419095752ff2ebd2261557ce300cadfe7658a7107695309e893919c72a755eef7c872c640e4d3ceba32440e71facc918fabb8171c3423d SHA512 b5cf92465cd93eaee8568a6732920a7f73765672f81d3dea14e69879845bb67577e054e5ef69e06d9c9801f75b55d6e8fa3be0e96abca5d90fa34efa910ea6dd
 EBUILD onnx-1.12.0.ebuild 822 BLAKE2B bd238d6e73ec27dee4419095752ff2ebd2261557ce300cadfe7658a7107695309e893919c72a755eef7c872c640e4d3ceba32440e71facc918fabb8171c3423d SHA512 b5cf92465cd93eaee8568a6732920a7f73765672f81d3dea14e69879845bb67577e054e5ef69e06d9c9801f75b55d6e8fa3be0e96abca5d90fa34efa910ea6dd
 EBUILD onnx-1.13.1-r1.ebuild 654 BLAKE2B c2c8c47303a994fd110a2a1bc376a9dc1859293cbfaf1c0689834d671111cb899bcfabd98746d2eeff5ceaa2c0d79b97d12f7cfd0fcdd5d03dce72dc764917cc SHA512 210406457327445cd54adf070737a80268c5432d1cd145a4a68d41d25d447c319274fd80aeb862e21389984b2d05934f8de6667dfc64ce9d3aaaa6097c482722
-EBUILD onnx-1.14.0-r1.ebuild 653 BLAKE2B ab439d13dd7c90109cb65442337949ecd0058e6ebc0e868a553127d32602b3fcd83fb284bf769a66317e65f5651e8f0fe2ede5585d630c87a4abc5ca2452a3c0 SHA512 0b0abee53951db444fb9cd024fd63d788c5966e07f8a6011b7082ca6f9fdb2b526d3b26649a8afd87e0bc4d8ee9cc0245fa95f8389032677d0a2f0fa16dd782b
+EBUILD onnx-1.14.0-r2.ebuild 1155 BLAKE2B baee6e795f05aa4dda46c46801a6ac7cd31ba69f996b46945a2f836dea2818af63b348ca33e071a8dfec1166b5afd20bc10e2cfc118852cc972f45e668b13301 SHA512 952ed29b4c212a2c61b6557e5b7ed5791d07fbc7249c5f317ce2148c342bae72f665edabc4bfd1fb6cf9db78d9e6e6b6c81403dad95c2128949cdf14e9bb915f
 MISC metadata.xml 322 BLAKE2B a78b6feffba2cf354154448a0e0cef5e866ec51ff0158939e7a5be1f3c4cb9bb3b29ae88ae06540627946fc3e0f6e9a63ef4d8951385e840a7a87ada99e1d50a SHA512 9d81e8e43822232c8c8cf690b6bdb9939f04adeb9230f8225a5b0b10083f9555304768901c46cc5d29c41038397bbb3b12e0111c3d0443f4c0003e99b99fc50f
diff --git a/sci-libs/onnx/onnx-1.14.0-r1.ebuild b/sci-libs/onnx/onnx-1.14.0-r1.ebuild
deleted file mode 100644
index bed797b68a21..000000000000
--- a/sci-libs/onnx/onnx-1.14.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-inherit python-any-r1 cmake
-
-DESCRIPTION="Open Neural Network Exchange (ONNX)"
-HOMEPAGE="https://github.com/onnx/onnx"
-SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-libs/protobuf:="
-BDEPEND="
-	${PYTHON_DEPS}
-"
-
-PATCHES=( "${FILESDIR}"/${P}-cxx_14.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DONNX_USE_PROTOBUF_SHARED_LIBS=ON
-	)
-	cmake_src_configure
-}
diff --git a/sci-libs/onnx/onnx-1.14.0-r2.ebuild b/sci-libs/onnx/onnx-1.14.0-r2.ebuild
new file mode 100644
index 000000000000..7fcd28a9355b
--- /dev/null
+++ b/sci-libs/onnx/onnx-1.14.0-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_OPTIONAL=1
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{9..11} )
+inherit distutils-r1 cmake
+
+DESCRIPTION="Open Neural Network Exchange (ONNX)"
+HOMEPAGE="https://github.com/onnx/onnx"
+SRC_URI="https://github.com/onnx/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.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-libs/protobuf:=
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="python? (
+	${DISTUTILS_DEPS}
+)"
+
+PATCHES=( "${FILESDIR}"/${P}-cxx_14.patch )
+
+src_prepare() {
+	cmake_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DONNX_USE_PROTOBUF_SHARED_LIBS=ON
+	)
+	cmake_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use python && distutils-r1_src_compile
+}
+
+src_install() {
+	cmake_src_install
+	use python && distutils-r1_src_install
+}