[gentoo-commits] repo/gentoo:master commit in: sci-libs/onnx/, sci-libs/onnx/files/

2024-05-26 Thread Alfredo Tupone
commit: 08570597e46e05a9a47dc0f30a41286d4f0eeaf2
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Sun May 26 15:46:37 2024 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Sun May 26 15:46:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08570597

sci-libs/onnx: drop 1.14.1-r2

Signed-off-by: Alfredo Tupone  gentoo.org>

 sci-libs/onnx/Manifest   |  1 -
 sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch | 11 -
 sci-libs/onnx/files/onnx-1.14.1-musl.patch   | 11 -
 sci-libs/onnx/onnx-1.14.1-r2.ebuild  | 64 
 4 files changed, 87 deletions(-)

diff --git a/sci-libs/onnx/Manifest b/sci-libs/onnx/Manifest
index 9b84f011ad21..65ea12c9ba56 100644
--- a/sci-libs/onnx/Manifest
+++ b/sci-libs/onnx/Manifest
@@ -1,3 +1,2 @@
-DIST onnx-1.14.1.tar.gz 11570627 BLAKE2B 
df478219b5d557ad7e0717377996eefc02baa88a89d9681b17e00670e42fa3c8e47db0f5c5fdfab682fa7d80032559da8276c5106a91a7599d190427e2b6e4a8
 SHA512 
f846fffb286c4aeadc01462f220515f0a5c2ce1cbec849da7092a08c2676f8308af7315318a2866e9182f9aed719984ef95a9ddc69ffe0e62e40664395df5efd
 DIST onnx-1.15.0.tar.gz 12360484 BLAKE2B 
4d35b82c128a69124b9bfcb3e56b3d584b7451ae739a91039e201dd485efa3e90e34e6cf135993317622f8f524160a38556231b2b0561e93d8cd0487abf35c1b
 SHA512 
b46a4ab70af88053318eba45251c1f71528f15e45a33042877570e8d857febd3ec66e2e811fcda2105a4f17b84c9a1c6a0aaa22756c3287321b3ea29e83127fd
 DIST onnx-1.16.0.tar.gz 12428161 BLAKE2B 
b0d16212c527078fcbe46af8efaf8bfccb0a22825cfee3c88728314599bc90f5b43ae407cc9ec10300ed19367dff769a5d6ba29d2faa61fd8e27029e2d64e83a
 SHA512 
ef641447d8d6c4ed9f083793fe14a8568d6aa7b9b7e7b859a4082e9b892acd801230da2027d097ceaa0d68bbd37b2422b89bb7d1d55d5c3b5955c0f9c7c657c5

diff --git a/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch 
b/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch
deleted file mode 100644
index 239e0bd3a56a..
--- a/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/CMakeLists.txt   2023-09-01 12:19:40.772172388 +0200
-+++ b/CMakeLists.txt   2023-09-01 12:19:53.422188861 +0200
-@@ -58,7 +58,7 @@
- # Required to use /std:c++17 or higher on Windows
- # For other platforms, set C++11 as standard for the whole project
- if(NOT MSVC)
--  set(CMAKE_CXX_STANDARD 11)
-+  set(CMAKE_CXX_STANDARD 14)
- else()
-   string(APPEND CMAKE_CXX_FLAGS " /std:c++17")
- endif()

diff --git a/sci-libs/onnx/files/onnx-1.14.1-musl.patch 
b/sci-libs/onnx/files/onnx-1.14.1-musl.patch
deleted file mode 100644
index 04748ed67e6a..
--- a/sci-libs/onnx/files/onnx-1.14.1-musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/onnx/checker.cc  2024-02-18 15:30:03.316320035 +0100
-+++ b/onnx/checker.cc  2024-02-18 15:31:05.715473732 +0100
-@@ -184,7 +184,7 @@
- }
- std::string data_path = path_join(ctx.get_model_dir(), relative_path);
- // use stat64 to check whether the file exists
--#if defined(__APPLE__) || defined(__wasm__)
-+#if defined(__APPLE__) || defined(__wasm__) || !defined(__GLIBC__)
- struct stat buffer; // APPLE does not have stat64
- if (stat((data_path).c_str(), ) != 0) {
- #else

diff --git a/sci-libs/onnx/onnx-1.14.1-r2.ebuild 
b/sci-libs/onnx/onnx-1.14.1-r2.ebuild
deleted file mode 100644
index e6ecbfd239bc..
--- a/sci-libs/onnx/onnx-1.14.1-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2022-2024 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..12} )
-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-python/pybind11[${PYTHON_USEDEP}]
-   )
-   dev-libs/protobuf:=
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="python? (
-   ${DISTUTILS_DEPS}
-)"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.14.0-cxx_14.patch
-   "${FILESDIR}"/${P}-musl.patch
-)
-
-src_prepare() {
-   cmake_src_prepare
-   use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-   mycmakeargs=(
-   -DONNX_USE_PROTOBUF_SHARED_LIBS=ON
-   -DONNX_USE_LITE_PROTO=ON
-   )
-   cmake_src_configure
-   use python && distutils-r1_src_configure
-}
-
-src_compile() {
-   cmake_src_compile
-   use python && CMAKE_ARGS="${mycmakeargs[@]}" distutils-r1_src_compile
-}
-
-src_install() {
-   cmake_src_install
-   use python && distutils-r1_src_install
-}



[gentoo-commits] repo/gentoo:master commit in: sci-libs/onnx/, sci-libs/onnx/files/

2023-09-01 Thread Alfredo Tupone
commit: 1ecf45d471c13e219317798836096f4c34fe64a1
Author: Alfredo Tupone  gentoo  org>
AuthorDate: Fri Sep  1 10:32:00 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Fri Sep  1 10:33:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ecf45d4

sci-libs/onnx: use cxx 144

Closes: https://bugs.gentoo.org/912837
Signed-off-by: Alfredo Tupone  gentoo.org>

 sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch| 11 +++
 sci-libs/onnx/{onnx-1.13.1.ebuild => onnx-1.13.1-r1.ebuild} |  2 ++
 sci-libs/onnx/{onnx-1.14.0.ebuild => onnx-1.14.0-r1.ebuild} |  2 ++
 3 files changed, 15 insertions(+)

diff --git a/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch 
b/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch
new file mode 100644
index ..239e0bd3a56a
--- /dev/null
+++ b/sci-libs/onnx/files/onnx-1.14.0-cxx_14.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt   2023-09-01 12:19:40.772172388 +0200
 b/CMakeLists.txt   2023-09-01 12:19:53.422188861 +0200
+@@ -58,7 +58,7 @@
+ # Required to use /std:c++17 or higher on Windows
+ # For other platforms, set C++11 as standard for the whole project
+ if(NOT MSVC)
+-  set(CMAKE_CXX_STANDARD 11)
++  set(CMAKE_CXX_STANDARD 14)
+ else()
+   string(APPEND CMAKE_CXX_FLAGS " /std:c++17")
+ endif()

diff --git a/sci-libs/onnx/onnx-1.13.1.ebuild 
b/sci-libs/onnx/onnx-1.13.1-r1.ebuild
similarity index 91%
rename from sci-libs/onnx/onnx-1.13.1.ebuild
rename to sci-libs/onnx/onnx-1.13.1-r1.ebuild
index cee6ddd5c494..1de081f5931b 100644
--- a/sci-libs/onnx/onnx-1.13.1.ebuild
+++ b/sci-libs/onnx/onnx-1.13.1-r1.ebuild
@@ -22,6 +22,8 @@ BDEPEND="
${PYTHON_DEPS}
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-1.14.0-cxx_14.patch )
+
 src_configure() {
local mycmakeargs=(
-DONNX_USE_PROTOBUF_SHARED_LIBS=ON

diff --git a/sci-libs/onnx/onnx-1.14.0.ebuild 
b/sci-libs/onnx/onnx-1.14.0-r1.ebuild
similarity index 93%
rename from sci-libs/onnx/onnx-1.14.0.ebuild
rename to sci-libs/onnx/onnx-1.14.0-r1.ebuild
index 866f8a5e90fd..bed797b68a21 100644
--- a/sci-libs/onnx/onnx-1.14.0.ebuild
+++ b/sci-libs/onnx/onnx-1.14.0-r1.ebuild
@@ -22,6 +22,8 @@ BDEPEND="
${PYTHON_DEPS}
 "
 
+PATCHES=( "${FILESDIR}"/${P}-cxx_14.patch )
+
 src_configure() {
local mycmakeargs=(
-DONNX_USE_PROTOBUF_SHARED_LIBS=ON