commit: ebd33ef3a91a715a6ad1dffd87b0b17ca23640ad Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org> AuthorDate: Wed May 3 18:15:31 2023 +0000 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> CommitDate: Wed May 3 18:16:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebd33ef3
dev-libs/libpy: Add py311, eapi8 Disable tests for now since they fail to build with a C++ error that I don't know how to fix. Closes: https://bugs.gentoo.org/894744 Closes: https://bugs.gentoo.org/896720 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> dev-libs/libpy/files/libpy-0.2.5-setuptools.patch | 11 +++++++++++ dev-libs/libpy/files/libpy-0.2.5-stdint.patch | 11 +++++++++++ .../{libpy-0.2.5-r1.ebuild => libpy-0.2.5-r2.ebuild} | 19 ++++++++++++++----- 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/dev-libs/libpy/files/libpy-0.2.5-setuptools.patch b/dev-libs/libpy/files/libpy-0.2.5-setuptools.patch new file mode 100644 index 000000000000..0f5adc5e9c98 --- /dev/null +++ b/dev-libs/libpy/files/libpy-0.2.5-setuptools.patch @@ -0,0 +1,11 @@ +diff --git a/setup.py b/setup.py +index 61bc3da..39c2ea5 100644 +--- a/setup.py ++++ b/setup.py +@@ -1,5 +1,5 @@ + import ast +-from distutils.command.build_py import build_py as _build_py ++from setuptools.command.build_py import build_py as _build_py + import os + import pathlib + import shutil diff --git a/dev-libs/libpy/files/libpy-0.2.5-stdint.patch b/dev-libs/libpy/files/libpy-0.2.5-stdint.patch new file mode 100644 index 000000000000..d641ea4da1f4 --- /dev/null +++ b/dev-libs/libpy/files/libpy-0.2.5-stdint.patch @@ -0,0 +1,11 @@ +diff --git a/include/libpy/util.h b/include/libpy/util.h +index 3e0c72d..8669483 100644 +--- a/include/libpy/util.h ++++ b/include/libpy/util.h +@@ -1,5 +1,6 @@ + #pragma once + ++#include <cstdint> + #include <algorithm> + #include <sstream> + #include <stdexcept> diff --git a/dev-libs/libpy/libpy-0.2.5-r1.ebuild b/dev-libs/libpy/libpy-0.2.5-r2.ebuild similarity index 79% rename from dev-libs/libpy/libpy-0.2.5-r1.ebuild rename to dev-libs/libpy/libpy-0.2.5-r2.ebuild index f17fd083c69e..e11055754550 100644 --- a/dev-libs/libpy/libpy-0.2.5-r1.ebuild +++ b/dev-libs/libpy/libpy-0.2.5-r2.ebuild @@ -1,10 +1,11 @@ # Copyright 2021-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 - -PYTHON_COMPAT=( python3_{9..10} ) +EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=setuptools inherit flag-o-matic distutils-r1 GTEST_VER="23b2a3b1cf803999fb38175f6e9e038a4495c8a5" @@ -25,8 +26,11 @@ IUSE="sparsehash test" COMMON_DEPEND=" >=dev-python/numpy-1.11.3[${PYTHON_USEDEP}] " -RDEPEND="${COMMON_DEPEND}" -BDEPEND="${COMMON_DEPEND} +RDEPEND=" + ${COMMON_DEPEND} +" +BDEPEND=" + ${COMMON_DEPEND} sparsehash? ( dev-cpp/sparsehash ) test? ( dev-cpp/gtest @@ -37,10 +41,15 @@ BDEPEND="${COMMON_DEPEND} RESTRICT="!test? ( test )" REQUIRED_USE="test? ( sparsehash )" +# my C++ isn't good enough to fix the tests +RESTRICT+=" test" + PATCHES=( "${FILESDIR}/libpy-0.2.5-no-werror.patch" "${FILESDIR}/libpy-0.2.5-permissions.patch" "${FILESDIR}/libpy-0.2.5-cflags.patch" + "${FILESDIR}/libpy-0.2.5-stdint.patch" + "${FILESDIR}/libpy-0.2.5-setuptools.patch" ) python_test() {
