gentoo resync : 29.12.2022

4 files changed, 7 insertions, 73 deletions

diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index ab0c20d5fd21..ae2341347f8e 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,7 +1,5 @@
-DIST trimesh-3.10.8.gh.tar.gz 10741790 BLAKE2B 2cc8573e01395fb95f192cd64370b32d63b3ebd3505008c67fc9530641060b127ff42b8892634bf61fd91dbc37098e0da9fa169199d257a0345494cf9996a764 SHA512 c5cd6a6abcf8b8e6cc157a76607d4db090c574a86450956577d81fff310448bab140007eefc3b2c2cea6873a1ef46eccb18834c1593aca40f3d7868b3ce3992e
-DIST trimesh-3.11.2.gh.tar.gz 10745738 BLAKE2B 59a13c2133f7cb0ad22ca5b03af9e61c4cc1431e8d058566b854240fe0b1e28229c427c69aa16aec8b79f139a0c2a3c5202ce2f6d4750f813325e591e3a671b2 SHA512 f9b3643c221ab3f112d4c5cf07c8cf23c5809d7c0ea733b6cda0efc973a78fb4ebd8be9cd0f52bb65babeb5a3dc448b15b738f3089fffb8a32c1af1b01dc8da0
-DIST trimesh-3.12.0.gh.tar.gz 10751006 BLAKE2B 544dac08bf214a703fe00666269f64aad280232245665d544b52eab33e44dab8369bd068c638c8088792e9f62cd54724d2f5758238e4c95e8d74c3f266d86127 SHA512 6c054c92b50e1b3c85c0022969b752d3c97b73f797883a11967645fcab462f8008684a371145cdd0c01896c508eba4f98ac5e3bafd74c9f0b363c2d62275f0b7
-EBUILD trimesh-3.10.8.ebuild 1870 BLAKE2B 39af2219414044af45146cde9136cb680caf29efa1c581e9a8f148eb7a3e3ff1ed96343820bf3d46eb85e20aba7e02ecbdf28d2541b133f9c654fff72af45abb SHA512 8ec82ca2f70165885cd35b2a141c7767f133f070b6d2b89e2bef46e3a362f740df90255e2095e4bed918bc7d9a0c75c09121d72d99d9e8c6fc1b6cdfa6afc02a
-EBUILD trimesh-3.11.2.ebuild 1911 BLAKE2B 5fcc62d4b48d27980a203f1fc6cfa511fd2cd017d07a5a7ac5703e3eba08f8a70b008e3869402476b29d3e137372cc1094f6140262f724a6b9f31387470a09a1 SHA512 d42bffb67264de189eec19aa7ef281769a84bec26c427bb8a31cf21f626e43405c344fa466048aa730432a46ce7a798cf03e54b327d26af7fb208f67a47e83af
-EBUILD trimesh-3.12.0.ebuild 1911 BLAKE2B 5fcc62d4b48d27980a203f1fc6cfa511fd2cd017d07a5a7ac5703e3eba08f8a70b008e3869402476b29d3e137372cc1094f6140262f724a6b9f31387470a09a1 SHA512 d42bffb67264de189eec19aa7ef281769a84bec26c427bb8a31cf21f626e43405c344fa466048aa730432a46ce7a798cf03e54b327d26af7fb208f67a47e83af
+DIST trimesh-3.12.5.gh.tar.gz 10755276 BLAKE2B ced596c4182b085df8c59bc007977aebb94702edd364ed67ee0114376b235fe020bbeee130853e1e0fbabd1f1d0f6523faaf268ffba1b4c7c30f3f794b64e51b SHA512 d467bd6ceb5b567182ac80ea38374f28b85b9ab983edf98428e09c8f799c206d23e282c03c808227c92e2dcb37f3faabea8d5db74b8ac419265751bcbaa396e1
+DIST trimesh-3.12.6.gh.tar.gz 10755102 BLAKE2B 69336781530f0195c71e65d67ba3362314ad39c3dd349e9b88174136d85b3f72c5e64c93a0ca64572c1595292e2b241bea6552c1e33671fea48bc0aa42f21d13 SHA512 2c6d64ba3307cb50148f345db0f6fbf8f94838ba2171698fad31b2d26205860afa98cc803ccf7264422ca3cad65cb8cddb0f55dfac45f430d012a4579d5c08de
+EBUILD trimesh-3.12.5.ebuild 1853 BLAKE2B 8de3aacd8779c21d4642a94a6837215931601463a2908666b5f7645522ebf86def6db510a122c41dd82d002577a2a4ad6023cab744dbc091bc81a3f96582283f SHA512 2034954a8cb7701184d7e75d4cf9007a229732f166d110595bdd820eba289e0a12da44dcd83d6c6f8c9ca4027bc65ac5aa914c25aff2314000076bdaa20b184f
+EBUILD trimesh-3.12.6.ebuild 1854 BLAKE2B c1c62bbe27b6542bc9bac8d9b633bf3373b3f8e714eac7de4b23e4c8c85975e86e7c98d30bb9f71604174eeb6f9ae316ac221af4b451f65fa5350d4a38672b36 SHA512 e871fb00a7690a3cbb029e7ea8598deb9b193c646628df39353539dd0e37aa34e86699900a7ea3f898ee99224a172ca564292083d166f051e904f7cd57c4daec
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-3.10.8.ebuild b/dev-python/trimesh/trimesh-3.10.8.ebuild
deleted file mode 100644
index cef3a3a7573d..000000000000
--- a/dev-python/trimesh/trimesh-3.10.8.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing optfeature
-
-DESCRIPTION="Python library for loading and using triangular meshes"
-HOMEPAGE="https://trimsh.org/ https://github.com/mikedh/trimesh"
-# No tests in PyPI tarballs
-SRC_URI="
-	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/colorlog[${PYTHON_USEDEP}]
-	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pycollada[${PYTHON_USEDEP}]
-	dev-python/pyglet[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/svg-path[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-	dev-python/xxhash[${PYTHON_USEDEP}]
-	sci-libs/rtree[${PYTHON_USEDEP}]
-	sci-libs/shapely[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} functionality can be extended by installing the following packages:"
-	optfeature "making GUI applications with 3D stuff" dev-python/glooey
-	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
-	optfeature "loading a number of additional mesh formats" dev-python/meshio
-	optfeature "figuring out how much memory we have" dev-python/psutil
-	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
-}
diff --git a/dev-python/trimesh/trimesh-3.12.0.ebuild b/dev-python/trimesh/trimesh-3.12.5.ebuild
index a3816df1ff09..3d5249af810b 100644
--- a/dev-python/trimesh/trimesh-3.12.0.ebuild
+++ b/dev-python/trimesh/trimesh-3.12.5.ebuild
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/mikedh/trimesh/
 	https://pypi.org/project/trimesh/
 "
-# No tests in PyPI tarballs
 SRC_URI="
 	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -22,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
@@ -53,7 +52,7 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_test() {
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	epytest -n "$(makeopts_jobs)"
 }
 
 pkg_postinst() {
diff --git a/dev-python/trimesh/trimesh-3.11.2.ebuild b/dev-python/trimesh/trimesh-3.12.6.ebuild
index a3816df1ff09..ab4e31971d7a 100644
--- a/dev-python/trimesh/trimesh-3.11.2.ebuild
+++ b/dev-python/trimesh/trimesh-3.12.6.ebuild
@@ -14,7 +14,6 @@ HOMEPAGE="
 	https://github.com/mikedh/trimesh/
 	https://pypi.org/project/trimesh/
 "
-# No tests in PyPI tarballs
 SRC_URI="
 	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
@@ -53,7 +52,7 @@ BDEPEND="
 distutils_enable_tests pytest
 
 python_test() {
-	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	epytest -n "$(makeopts_jobs)"
 }
 
 pkg_postinst() {