gentoo resync : 18.12.2020

4 files changed, 4 insertions, 62 deletions

diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 7d5b7f512d23..5e02fe418b0f 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,7 +1,5 @@
 DIST pyopencl-2020.2.2.tar.gz 352110 BLAKE2B a3bb5f74abbb5d9600651dc0659f2472f7bf91d67cf3474f7306a29ccd3a8249dc952fc1e5b81f0514990e49246d106325a6697559b260a490981541666cb3a7 SHA512 2c4f21d9c0a5d3d53f2a0e4aaa8f85f42fc6fbedc5282cfc107ff047936aa731a973605f5500b56b62d5b580a00e9f2be2aa9a259287291641ca4b4d60c51ca9
-DIST pyopencl-2020.2.tar.gz 351600 BLAKE2B 47a733d7a552f5d1f69a1a9710c3262d50c26651ed9f46146829babe28962e236e2c1b9ba3d3d14207f28bdc562323a94ab4c51dbf5fcf1a0b12282b3c6aff50 SHA512 233bbf2e99507d3a832222cc8149bf7ac17332a550e4867f843fcc2b31104d961a3f0d972b0a1878d4716b2da4548f1390560141cd09cb1ba13300c541b058b9
 DIST pyopencl-2020.3.1.tar.gz 357422 BLAKE2B de9cb6408e957e30f54797ce682ed17f3272dc82019bcd9a744a0696a7e344f47645a3549332da90e0bcc442f7a8ea9c6a12a375875a9728fa9814ca9d1a9b30 SHA512 459d6f060f4203e83276c47bf832f33fc4348dd59904ea55fe2a53684cb7c8eaad45875476d10dcb6653820f9cb1f7e013c6b854410b2040b2dfe847fc1f7658
-EBUILD pyopencl-2020.2.2.ebuild 1458 BLAKE2B 432af46ec53efafe01f85fd3526802deccefcdcdd0a77e9e15a0ae92b42c9915c93a255c693504b8f586d0f8246945ce5173a144b2dc2e7440ebdfa8ecc613a1 SHA512 3f6c952a342a9d77ecea70ba6518c6204d46bb23ce18a004d0f69042848a071df099d0b7840d3036cbc0683f80cc5b6e3b97621972291d6878e722d9516e8750
-EBUILD pyopencl-2020.2.ebuild 1457 BLAKE2B b899057e68131fe0bfb4a5848f520cf557da23aa07fec39aa9bab4113696232d8152ff2f1704ffc523a0eec90f0d01f56a9dda52cabb1996bc177cfdba988c29 SHA512 2c69164b3057ca058b73c07741a111fb3583adf8928abcef98cb876514c528df594a4affde55ffae66bb4c0a2fbbdd5df972abef99ecd0517f8141e9b81edd70
-EBUILD pyopencl-2020.3.1.ebuild 1458 BLAKE2B 432af46ec53efafe01f85fd3526802deccefcdcdd0a77e9e15a0ae92b42c9915c93a255c693504b8f586d0f8246945ce5173a144b2dc2e7440ebdfa8ecc613a1 SHA512 3f6c952a342a9d77ecea70ba6518c6204d46bb23ce18a004d0f69042848a071df099d0b7840d3036cbc0683f80cc5b6e3b97621972291d6878e722d9516e8750
+EBUILD pyopencl-2020.2.2.ebuild 1457 BLAKE2B b899057e68131fe0bfb4a5848f520cf557da23aa07fec39aa9bab4113696232d8152ff2f1704ffc523a0eec90f0d01f56a9dda52cabb1996bc177cfdba988c29 SHA512 2c69164b3057ca058b73c07741a111fb3583adf8928abcef98cb876514c528df594a4affde55ffae66bb4c0a2fbbdd5df972abef99ecd0517f8141e9b81edd70
+EBUILD pyopencl-2020.3.1.ebuild 1459 BLAKE2B cb43e4cddf56b1fe1fd8e5b1896758a8dba57ea16bfe147329932c2a5f407accaa1bb3bb3f49e5d742a76c6cf852d2ca8a494bd5268cdc94643e4943e4e6ae1a SHA512 9799573e15cb4f3f7ccd3dbc364c720a2e70f99ab51f8c40c5e321b5bc567de0e07229ff8d0f4f4a37465a8fc5ceac1ec501551182658de119cd1bb9e0c3789a
 MISC metadata.xml 316 BLAKE2B 46de5d09541dbd7e1ae6cb3e46a87f0f7dde068ca48dfb4f8885b3f25a2c6ad258019a7585bc6dac42a01ce41292d5458aa7ba122fd81a1fe6f12307b0642966 SHA512 1ac69571c5ff5abb94dc68dc87d02d8675e12e120dedb0bece65a9cb81764f496a587e7345b43e8037f8d7ed6e269dfa276d8482ab42fdb4f3adda336570d703
diff --git a/dev-python/pyopencl/pyopencl-2020.2.2.ebuild b/dev-python/pyopencl/pyopencl-2020.2.2.ebuild
index e5fbb9b9f447..862f4155cff8 100644
--- a/dev-python/pyopencl/pyopencl-2020.2.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2020.2.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples opengl"
 
 COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyopencl/pyopencl-2020.2.ebuild b/dev-python/pyopencl/pyopencl-2020.2.ebuild
deleted file mode 100644
index 862f4155cff8..000000000000
--- a/dev-python/pyopencl/pyopencl-2020.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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"
-
-COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
-RDEPEND="${COMMON}
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2017.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=virtual/opencl-2"
-DEPEND="${COMMON}
-	dev-python/pybind11[${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
-# 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
-}
diff --git a/dev-python/pyopencl/pyopencl-2020.3.1.ebuild b/dev-python/pyopencl/pyopencl-2020.3.1.ebuild
index e5fbb9b9f447..2bc9b99b4716 100644
--- a/dev-python/pyopencl/pyopencl-2020.3.1.ebuild
+++ b/dev-python/pyopencl/pyopencl-2020.3.1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl
+HOMEPAGE="https://mathema.tician.de/software/pyopencl/
 	https://pypi.org/project/pyopencl/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"