gentoo resync : 25.08.2020

3 files changed, 17 insertions, 108 deletions

diff --git a/dev-python/pycuda/Manifest b/dev-python/pycuda/Manifest
index 0965c15c71b0..64f1a8db6757 100644
--- a/dev-python/pycuda/Manifest
+++ b/dev-python/pycuda/Manifest
@@ -1,4 +1,3 @@
-DIST pycuda-2018.1.1.tar.gz 1612853 BLAKE2B 7afbcc33891da96d726f07f1686bfb9a28b4a5ce3dfc754707166556153f91a0fbc3454d50ca678ac56b71e8dc15e8f7b797e8ff025e42aa9eed2eaaa797d952 SHA512 cb93855cf3cee6650ba0564bccce73c2f59ecbd579235eb3623ec32dde8d9247216e756b1342a876fc7d37c0159e741f5f626a86f2e7ab11c4b03c7a4e581a28
-EBUILD pycuda-2018.1.1.ebuild 2341 BLAKE2B 771004c137981e41e4b154b4ab085456e27e8e0b8cc91087ab88e7ef35bbdebcf8016266bbc13542a8af70855a92d2e568b3927e7e3e8b52eb18e26b41a9ab29 SHA512 27f3e4ea5ecbe0c79e2a9c3b2997f6604f09148394572e5e553450ea806d48e810a34dae6f74f7b62319b0a042dcac3c40d18b9d1e8b34e9809b94a18f79237f
-EBUILD pycuda-9999.ebuild 2389 BLAKE2B 23251e6d3c82c83551cd5544dcfe85141095ce2b873f9172dc49b0d5ae1b3e1e3919710bf92d62bcd6319ef28a0fbc85ee59d98525da29f9e1ef1f76e7f6959b SHA512 d4112f21be7938a65d8017e15f0242f491fb63460743c450b5fabc3e5e061db1700d74f3c383459032284f73a42dfc07ae0bb96d63b5f49a251c110ec47f031c
+DIST pycuda-2019.1.2.tar.gz 1584807 BLAKE2B 3250430ad626b28242ff44ab9576cf1f5ecf77530e789470dfebab324de95a735c0f56e67134891bace44b1f9b7a25133ffcb74c652c6568c5afedce26907fdb SHA512 22829daa5923342eec400a24342b1d738226073bb676476e4af97629d9311426b5d2465e60811696e55401568b90e152ac96d877c6262c416099a609862db742
+EBUILD pycuda-2019.1.2.ebuild 2218 BLAKE2B 62f3873bbe41dd71244c6e932d456a8d1d639d329eaca98bdc1f56b950709adf1c15ba8cebe591c2d6e0b0aa616e1fd073df6f4f550489ce7a29e61226361e23 SHA512 937aa73edb46c0ca3654396a81b672c9e726f11150fed17abd0ff011628dae286224e4aead5636fac9cd5d9dfc564c5f4cfa56cb911145c2bb1520eba75d31a5
 MISC metadata.xml 332 BLAKE2B f880a8d2cdbe4271dc2f1e91c32419420b22e00c0d358832614aa970e95d979b10661953b35dda0b30a23d36b995364464ebd3bb1a862a34f33e7a84fa9b8e84 SHA512 2a2ba5f70d55593801948a9143fce5ddb2922da30fc7c1ea3ec21ccbb391a09fc34be961e9dbccb53d6575aa347878d105526d85bb7cc3f2f561f1793f0eee5c
diff --git a/dev-python/pycuda/pycuda-2018.1.1.ebuild b/dev-python/pycuda/pycuda-2019.1.2.ebuild
index ddf5f6037bc1..054b9a6a5165 100644
--- a/dev-python/pycuda/pycuda-2018.1.1.ebuild
+++ b/dev-python/pycuda/pycuda-2019.1.2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit cuda distutils-r1
 
@@ -25,15 +26,14 @@ RDEPEND="
 	dev-util/nvidia-cuda-toolkit
 	x11-drivers/nvidia-drivers
 	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
 
 # We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
 # user is (usually) not in the video group
 RESTRICT="userpriv !test? ( test )"
 
+distutils_enable_tests pytest
+
 python_prepare_all() {
 	cuda_sanitize
 	sed -e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
@@ -49,14 +49,14 @@ python_configure() {
 	mkdir -p "${BUILD_DIR}" || die
 	cd "${BUILD_DIR}" || die
 	"${EPYTHON}" "${S}"/configure.py \
-		--boost-inc-dir="${EPREFIX}/usr/include" \
-		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
-		--boost-thread-libname=boost_thread-mt \
-		--cuda-root="${EPREFIX}/opt/cuda" \
-		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
-		--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
+		--boost-inc-dir="${EPREFIX}"/usr/include \
+		--boost-lib-dir="${EPREFIX}"/usr/$(get_libdir) \
+		--boost-python-libname=boost_${EPYTHON/./}.so \
+		--boost-thread-libname=boost_thread \
+		--cuda-root="${EPREFIX}"/opt/cuda \
+		--cudadrv-lib-dir="${EPREFIX}"/usr/$(get_libdir) \
+		--cudart-lib-dir="${EPREFIX}"/opt/cuda/$(get_libdir) \
+		--cuda-inc-dir="${EPREFIX}"/opt/cuda/include \
 		--no-use-shipped-boost \
 		$(usex opengl --cuda-enable-gl "") || die
 }
@@ -67,17 +67,15 @@ src_test() {
 	addwrite /dev/nvidiactl
 	addwrite /dev/nvidia-uvm
 	addwrite /dev/nvidia-uvm-tools
-	python_test() {
-		pytest -vv || die "Tests fail with ${EPYTHON}"
-	}
+
 	distutils-r1_src_test
 }
 
 python_install_all() {
 	distutils-r1_python_install_all
+
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
-
 	fi
 }
diff --git a/dev-python/pycuda/pycuda-9999.ebuild b/dev-python/pycuda/pycuda-9999.ebuild
deleted file mode 100644
index 9e930995b6dd..000000000000
--- a/dev-python/pycuda/pycuda-9999.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit cuda distutils-r1 git-r3 multilib
-
-DESCRIPTION="Python wrapper for NVIDIA CUDA"
-HOMEPAGE="https://mathema.tician.de/software/pycuda/ https://pypi.org/project/pycuda/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.tiker.net/trees/pycuda.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="examples opengl test"
-
-RDEPEND="
-	dev-libs/boost[python,${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2013[${PYTHON_USEDEP}]
-	dev-util/nvidia-cuda-toolkit
-	x11-drivers/nvidia-drivers
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mako[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# We need write acccess /dev/nvidia0 and /dev/nvidiactl and the portage
-# user is (usually) not in the video group
-RESTRICT="userpriv !test? ( test )"
-
-python_prepare_all() {
-	cuda_sanitize
-	sed \
-		-e "s:'--preprocess':\'--preprocess\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:\"--cubin\":\'--cubin\', \'--compiler-bindir=$(cuda_gccdir)\':g" \
-		-e "s:/usr/include/pycuda:${S}/src/cuda:g" \
-		-i pycuda/compiler.py || die
-
-	touch siteconf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure() {
-	local myopts=()
-	use opengl && myopts+=( --cuda-enable-gl )
-
-	mkdir "${BUILD_DIR}" || die
-	cd "${BUILD_DIR}" || die
-	[[ -e ./siteconf.py ]] && rm -f ./siteconf.py
-	"${EPYTHON}" "${S}"/configure.py \
-		--boost-inc-dir="${EPREFIX}/usr/include" \
-		--boost-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--boost-python-libname=boost_python-$(echo ${EPYTHON} | sed 's/python//')-mt \
-		--boost-thread-libname=boost_thread-mt \
-		--cuda-root="${EPREFIX}/opt/cuda" \
-		--cudadrv-lib-dir="${EPREFIX}/usr/$(get_libdir)" \
-		--cudart-lib-dir="${EPREFIX}/opt/cuda/$(get_libdir)" \
-		--cuda-inc-dir="${EPREFIX}/opt/cuda/include" \
-		--no-use-shipped-boost \
-		"${myopts[@]}"
-}
-
-src_test() {
-	# we need write access to this to run the tests
-	addwrite /dev/nvidia0
-	addwrite /dev/nvidiactl
-	python_test() {
-			py.test --debug -v -v -v || die "Tests fail with ${EPYTHON}"
-	}
-	distutils-r1_src_test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}