gentoo auto-resync : 03:05:2023 - 23:26:49

4 files changed, 39 insertions, 6 deletions

diff --git a/dev-libs/libpy/Manifest b/dev-libs/libpy/Manifest
index 9600b24bf4b2..27e144e6c916 100644
--- a/dev-libs/libpy/Manifest
+++ b/dev-libs/libpy/Manifest
@@ -1,7 +1,9 @@
 AUX libpy-0.2.5-cflags.patch 841 BLAKE2B 00b6cc57401dc4c2a807e3a46659453dccf1d4cf59b5fdf6aa61426ac0922d1be6f4658fb4736787019fbd6a3b1aaa4294e3aae7be329ff9d215565c42083cf6 SHA512 5bc9ae86ad3abe7551c422a383217a12aec84376ccf23a7ffb9aaf18b1101972efe5730cfcfd194bd6c77d5d10d02f1cde2b13295c9464f503951bdb87afd6e5
 AUX libpy-0.2.5-no-werror.patch 286 BLAKE2B 3c623746f7d97c94eaab94c75d50cae433c6a9d545ee751d2a35c2e361b2260d789fee269628416f0d6e0f060f012a4cd696cf7ea58f11ff0df63cab223107d9 SHA512 2ea9e9d3040ffcb76c49f4e4b6123a8d6d739fec4898877d2dac151d35d31f12c156024beaeb82c470d92007318e3126fd8b94f0db340db08c87cad42c00879b
 AUX libpy-0.2.5-permissions.patch 360 BLAKE2B dff3c4650d5779e8756dbd30a62a6105070ef97cc806f5de1de106f5f51fdf29b514601dfae8d645e51aa36a9914e77998f6a36560990f1f656048b19121db32 SHA512 6eced1f0d98a9157bc7efe540bbc3211b4e4c78cfce533d96e71f1503f07355665da0d715b1fdf4d9e0394cb624f93b817f90801a830bb091a19b85963ed86dd
+AUX libpy-0.2.5-setuptools.patch 288 BLAKE2B f971e67fbac3d82450004d8124b7e85f7255a36e80c9c823035190093eb5dfdccca987cda12592ceb7c1c2cf0937d3b74203ca9194ce56eb0bb5a3c6bf51863d SHA512 da0516b7d1604ed01f4f30da3a0ab1ede0c9561244e2f935345c10197ce8a43f055757b6013b89c28f8bdd2e7040dc8224af4020b668058c3a789e2722c2e435
+AUX libpy-0.2.5-stdint.patch 257 BLAKE2B c90530144f700a85b659aeda245face0f4761a37c0912871ab6742972e86fc33218ba43336cff65a83149272b04c7aebdfb6bd1ed9b15fa5ed807ce2cd1be6f0 SHA512 72401c5402e7a2a744e27ceceebca12015ddff44c267c05138b22a7bd4798a098050d880662a5f7952fc9802d1299fcf77fa37af4fb0fc4a9631f6c4a27a7a82
 DIST gtest-23b2a3b1cf803999fb38175f6e9e038a4495c8a5.tar.gz 862253 BLAKE2B a7d7acd2a41924d37c06e4908315d80df92815ed3e81973baf915951f2fcfeb4485ce690ba224cd7168537d81bf43b84efbecef8074dd3246a020e0877924803 SHA512 f01af7e17a3b7fb064bb5b7f1f75f0eca5e987a9976555734a88b7f7a18a763c620668da0628cb6bd1553a69b248bb0b91569b99cf873789c5b27700c25a479a
 DIST libpy-0.2.5.tar.gz 201467 BLAKE2B 629f650740a54736bc014abd63c729c11070d7d226469668386b6fe187a05b830b7ababa17e6c90777c97d2af5397cb1295712218626c837c1cc2c5526e957fc SHA512 8127bdeffdf218837928d6e5743156987cb5e3ca943ec3e84f1fb5d01c1c5fa387eca3b8c276d60d1eeb18fad7a9555bc54c113c976f1d5f23f779336dd6ed71
-EBUILD libpy-0.2.5-r1.ebuild 1210 BLAKE2B 21a97309029b7c7eaefb626b57c266975df65976daf7efea76a0157f91c142d7a8237a05e09a14c597fc72db4a2eb38b6641d888e54146cce2e665bc183decd9 SHA512 c7d5210dc7ef40cd48d36636e02a365649c96649d814b94cc0e44556b62a57599a9a911e598aef991777dd2bf8dfa0befe27dbe132742efdd740f0eb60f39b1f
+EBUILD libpy-0.2.5-r2.ebuild 1409 BLAKE2B 7fdb6e737241b2f7fd9b6f73b7d537c3986db7317e4fa38cac2262523502ebfe5604a12f0073b512b0df80e27ec4e4924d6968b8389598aa3731cf40f050a3cd SHA512 9ab48f400ed102bd43f6d8651a06c354180d8173aab8960b544b72a259704213e50181a19c0584cede5bfad6f7c499282f11dd0557988c260f303ff2c8bbc287
 MISC metadata.xml 436 BLAKE2B ac6c46ec13e4a0f4a190cbc4c03b7a4a72bed6148730c65c56ee0ecb2298acffd536550237d12e2213e04e9a7a31cea4296b5f447857863a62a568d8449cfa0b SHA512 55718401fe31da4f3ec6cfb8b9b74e2429f0d54b87bdb6eb303b235930f034c533cd383004b501d211c2dd36a3d42baa1380c7d34a09facafebe3beb32d4dfaa
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
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() {