gentoo auto-resync : 28:07:2022 - 03:03:20

4 files changed, 9 insertions, 65 deletions

diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 134671c96b48..680bb81f324c 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,7 +1,5 @@
 DIST pyopencl-2022.1.5.tar.gz 454129 BLAKE2B 266bc327c9af5654287fc47cdf4e6002c7cddcd6f5e55bb70bb62aaee666dc5c102f78d4e946f010c1e109390c1d2e981e7ca6ca002d10f66248cb008b308734 SHA512 e6eb3e6d886d8ca1d94867a398b286556fd2d93535bb8481c7603cd521cd47606ce3d9cd6422830c6404305a4a1293234d8774fdda6923bdd2b4fc21fb39d377
 DIST pyopencl-2022.1.6.tar.gz 455424 BLAKE2B 03c46bebc4d6093489b0a1501267d5d67b73e9e7fe50f73cec3dd752fbb699adab63e08d60f3a54c8fd215cbb82c81353d28e875b953686b05e188df78cfe237 SHA512 a1e404c4c5f95d111690c969ae5c5d34f0deca2c8b93a5ce4d90e003031af7eb94a7708f878170a9b6e001b899d321f7dfdaa6f7545af3237d30d237d44bb45f
-DIST pyopencl-2022.1.tar.gz 452537 BLAKE2B 0d4d178a6bdf14dc3769dcb78c42bc894c0a443a6811fe9b25dedbc4a43debc06d1a1c32cb2a0df06fe16d1b2e78e65ef4f3ca8e9931be39384b3c8c813336de SHA512 e873807e757c19b59dbac2a0522fbb9c6e8af955d62bdcf06d8f3d792db3c9d2ce15372a6eefdca5b3f6756c35a85b5ff8d7dc1b6449bfd12c2b588576dd6f24
-EBUILD pyopencl-2022.1.5.ebuild 1525 BLAKE2B 58d1545624645c11beb3ba321a408fc3923efcc62d798ecd93457dceafad779c4b037ce5e3cce8a59f5f0a69adf12e47ae797ceebeaf499f6e08839fcb5a5275 SHA512 2b12e270fc76c324ce5e44085705e04eab5b79232c5b452492bb9a74870b324dc9a31eec177530c1fa1811c555d2f95531f1ca0ed18b55a711db6e6c9fe26458
-EBUILD pyopencl-2022.1.6.ebuild 1533 BLAKE2B 68ce81df540844a0b6637b5d1ca685c70dd38882dd9e143998bd87f520dbae5f5dae3169e22cb217bf18a75f44c0f39334884007f9af0055b4a5cf14790afdae SHA512 380dabe0541fabf9fa9c8b10404e98ca4f9633571b9660230f93cfe95adc7653696f5b8ae7f473bbee43b83464dae9c7388fe0176afeb71aad66377b2859dc23
-EBUILD pyopencl-2022.1.ebuild 1520 BLAKE2B 5ff0a66be8d8d323038a93879aaf5a00d8559a4271c7c1ecb3b7ce484b5b33b00ec6fd860f4ce0af533b690cea87c74ffb8f6e4b4b9c6840bbbc72c82a19a016 SHA512 e5257aa3af1faa3ab801b1765b25175f45baec990c3033243a71d3ac36908fc2d1bdb24f34d33163f59636cc5d7bab7399fad4e5eeb6f13ffb3891036452bacc
+EBUILD pyopencl-2022.1.5.ebuild 1572 BLAKE2B aaed0c92df6a752644454b17cdddb25f9c77179404a02b76ad3860d862faa9ff8b108b7f3330e385ab22360a41a25fbb6a4378fa4eee683d20955d71ac15d481 SHA512 60867d0d0708fdf047d72d8fd80a49c2b0b88abecb45a859f5690d9ceb07bb171e8789c9e7239d3f2c428ac2d4fb96fdbbab13d94a034e5c600e7caa196251c8
+EBUILD pyopencl-2022.1.6.ebuild 1599 BLAKE2B addd81de214a3c33e515e7716eb07ce1be83f487470a811e6df4de207bb315501f928290ce831c79f792ea7d67761725f656e8a71916393bcd48e9010a8e358f SHA512 36dccf1dd5cd846a64d6eeeb5fbc8fde0aaeacf7fd178531aa039341d69255a09a6745440980ada2983a0d4a59efef87edf21e358aa0ed34a7d7c9976a5fda84
 MISC metadata.xml 317 BLAKE2B ba532c522d5fd599dfd41180c9813f8124dc64cd3bc7a3a7b1ecdc121b216db4b43f6cae9c32c52a430fbf6e9a22c0cf27ffaf0041ca372d81666991bcf0e979 SHA512 845a8b83a5d7729ea0fca8b704de297b8b8c0d8f315fad0bea7c0c645bc79dd993209e9ca5e89ec9c8ddbe6db2b1f142c3e1f7e5b8e4b6259fe927527ce6a919
diff --git a/dev-python/pyopencl/pyopencl-2022.1.5.ebuild b/dev-python/pyopencl/pyopencl-2022.1.5.ebuild
index 261ffbe3f5b9..b6ce5908fee9 100644
--- a/dev-python/pyopencl/pyopencl-2022.1.5.ebuild
+++ b/dev-python/pyopencl/pyopencl-2022.1.5.ebuild
@@ -27,6 +27,7 @@ RDEPEND="${DEPEND}
 # libglvnd is only needed for the headers
 BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
+	<dev-python/pybind11-2.10.0[${PYTHON_USEDEP}]
 	opengl? ( media-libs/libglvnd )"
 
 # The test suite fails if there are no OpenCL platforms available, and
diff --git a/dev-python/pyopencl/pyopencl-2022.1.6.ebuild b/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
index aaaad732504f..19e2c5a987c8 100644
--- a/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
+++ b/dev-python/pyopencl/pyopencl-2022.1.6.ebuild
@@ -18,16 +18,18 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc64"
 IUSE="examples opengl"
 
-DEPEND=">=virtual/opencl-2"
-RDEPEND="${DEPEND}
+COMMON=">=virtual/opencl-2"
+# libglvnd is only needed for the headers
+DEPEND="${COMMON}
+	opengl? ( media-libs/libglvnd )"
+RDEPEND="${COMMON}
 	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
 	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
-# libglvnd is only needed for the headers
 BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
-	opengl? ( media-libs/libglvnd )"
+	<dev-python/pybind11-2.10.0[${PYTHON_USEDEP}]"
 
 # The test suite fails if there are no OpenCL platforms available, and
 # even if there is one (which requires the presence of both an OpenCL
diff --git a/dev-python/pyopencl/pyopencl-2022.1.ebuild b/dev-python/pyopencl/pyopencl-2022.1.ebuild
deleted file mode 100644
index ddb481845549..000000000000
--- a/dev-python/pyopencl/pyopencl-2022.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl/
-	https://pypi.org/project/pyopencl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples opengl"
-
-DEPEND=">=virtual/opencl-2"
-RDEPEND="${DEPEND}
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
-# libglvnd is only needed for the headers
-BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
-	opengl? ( media-libs/libglvnd )"
-
-# The test suite fails if there are no OpenCL platforms available, and
-# even if there is one (which requires the presence of both an OpenCL
-# runtime *and* hardware supported by it - simply emerging any runtime
-# is not enough) the vast majority of tests end up skipped because by
-# default the portage user hasn't got sufficient privileges to talk
-# to the GPU.
-RESTRICT="test"
-
-python_configure_all() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${EPYTHON}" configure.py \
-		"${myconf[@]}"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}