summaryrefslogtreecommitdiff
path: root/dev-python
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/Manifest.gzbin260890 -> 260885 bytes
-rw-r--r--dev-python/contourpy/Manifest2
-rw-r--r--dev-python/contourpy/contourpy-1.0.5.ebuild2
-rw-r--r--dev-python/imageio/Manifest11
-rw-r--r--dev-python/imageio/files/imageio-2.22.0-block-download.patch32
-rw-r--r--dev-python/imageio/imageio-2.21.1.ebuild52
-rw-r--r--dev-python/imageio/imageio-2.21.2.ebuild52
-rw-r--r--dev-python/imageio/imageio-2.22.0-r1.ebuild (renamed from dev-python/imageio/imageio-2.21.0.ebuild)29
-rw-r--r--dev-python/imageio/imageio-2.22.0.ebuild52
-rw-r--r--dev-python/matplotlib/Manifest2
-rw-r--r--dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild2
-rw-r--r--dev-python/python-rtmidi/Manifest2
-rw-r--r--dev-python/python-rtmidi/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch21
-rw-r--r--dev-python/qtconsole/Manifest2
-rw-r--r--dev-python/qtconsole/qtconsole-5.3.1.ebuild59
15 files changed, 80 insertions, 240 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 330684fac18e..cf2e1e3d95ba 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
Binary files differ
diff --git a/dev-python/contourpy/Manifest b/dev-python/contourpy/Manifest
index 45f6fd47d8ad..358f2249b54f 100644
--- a/dev-python/contourpy/Manifest
+++ b/dev-python/contourpy/Manifest
@@ -1,3 +1,3 @@
DIST contourpy-1.0.5.gh.tar.gz 12153420 BLAKE2B 1b3899831938c114480606f0c2ef2962248721884cd2be727f2bd11d12d322e7652c7b63860f4c5d8bd039a7e838f3f360dd1af017219caa97dfc63d69ef7e19 SHA512 47dc08f02920cb0ffc081f313dd041fa36e2fd0a81530374ae77adc288af13cf2c526fc1f45d06ef1c256c4c8fe243e0b36b54d3fff7d4f8bd6f9f4938d3c805
-EBUILD contourpy-1.0.5.ebuild 1028 BLAKE2B 18b4adec0c71c0faaec0e420b21493e0b90974bb399de3e183d2cc3d9157da90d4c89e8a0cbaf00aa3de5c24ab929078ca2ae9352b9f9239d6dd8ddbfbdd6dbe SHA512 3f2c36857b75931dc4756533b79e84124a2ac659feb003e9250626dac96a91f633edc7909a20aacf52a91b665be7b7204f1bcb07ca52626790688705ea62be77
+EBUILD contourpy-1.0.5.ebuild 1033 BLAKE2B 3854cc94acd15999fec3b74ad05860adfca2b1673044116224232d715506e4d505bf0f72e50ebd1472ef4983920bc71f0bc363a2dbe7558d3f0c4cd1021e46b2 SHA512 3890dc998d5b606aa982574f00f02187635e02856afbfa9777f8cbaa913e228bfceb11207937ca6b09aa265891285828224959f22cb977ba6571f759d0f2cce6
MISC metadata.xml 372 BLAKE2B de3d6cc9d8727bf43be63fdbb8aa2ad375667d189019e189be262e39d028acab98a21e200798c2d5c5c72521aa7d38202e3e235dd44de9b43a7dc9e045d50c47 SHA512 e692f94d805d7f56fc895a4c76dfbacf2f068d687b9191482b946445baa3bd0a685eda7a1b0aec2aaf9a02e6f23d87f0bf22d90f42e3c21d930724c635ff859a
diff --git a/dev-python/contourpy/contourpy-1.0.5.ebuild b/dev-python/contourpy/contourpy-1.0.5.ebuild
index e8d9091ceba9..1dcae6929eee 100644
--- a/dev-python/contourpy/contourpy-1.0.5.ebuild
+++ b/dev-python/contourpy/contourpy-1.0.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~riscv"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~riscv"
RDEPEND="
>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
diff --git a/dev-python/imageio/Manifest b/dev-python/imageio/Manifest
index 11ae4d5082c7..5716da214382 100644
--- a/dev-python/imageio/Manifest
+++ b/dev-python/imageio/Manifest
@@ -1,9 +1,6 @@
-DIST imageio-2.21.0.gh.tar.gz 391056 BLAKE2B 90fbacf7b396ab2b422d8694274ddc3642c92cfd325bce2861100f5bd28d82120cef6819b53b8ed82ba474d5e287765b63da9a7edfbfab5a026790a39d4edc1e SHA512 5bb070da560ba3a2e10bdb288ad539274ee14f8cf0543847859f0bae052b3d1782777d823435b74120bcfdff0b6cb15a6c80b2a9bf729439bbb3802f15cf5684
-DIST imageio-2.21.1.gh.tar.gz 391159 BLAKE2B 4c569ec81255d1f5985d2d30f303a978f9cb22e0d7368845648ddab9e5734adba52173d42ad73c94c424ce1a5806c3a10ae31381b04949f7f8c30fd327b585b4 SHA512 61fd4a1a64fb152fa5c419cac9a69ea979ac762fbaed81076ddd13602db98f71f31825615111958f21b021213d55be060197417159022bba84d631618f5bb286
-DIST imageio-2.21.2.gh.tar.gz 392425 BLAKE2B 959c89627188aca0072f519f0f9c3a9fcf2da96883f95760375bea503efd96ff6a198ad7e8bc12dfffe6aecf42f4b07176c8d273c6d349b5e2581053ddefecb6 SHA512 69922f05457f050083e92dbce34992911d5fb04f283d6784a8e1fd7f10e7887ffeef343d8f4162efaa55690f363ed6ceb5d2cdc5ee712ae9b276f072fdc45d37
+AUX imageio-2.22.0-block-download.patch 1211 BLAKE2B c01e3fd7db7463bc11bf331384a21becfc3160d4880a2fd09e47bf0927d97e46787097f50a489b83c2626078b60a0cf8a0d896040981e78c107f1783c8e84c26 SHA512 170261b9fb07ccb7f7a7e058335326df1f72c8d098076bf6ca048a7ca6bac95ddb512b9e41740c385430bc25613249455203addd59931af4e70298e772303964
DIST imageio-2.22.0.gh.tar.gz 394144 BLAKE2B 957edbeaad6be459ff865eed3159b0f7776e3dd0782e0380bfe2c40362d0c08ccc8f29a2f38a8427deb263554495b73cc4df641e569b9d33700fcc6ed1395396 SHA512 23d606e32ab2bdc306a4b9d17120e5eda8c8a4fd96d840181afecd6e35f6649621740608f0286d2a5462822acc7ef4e1e7f1e9076882ce975f1da717b136c8c4
-EBUILD imageio-2.21.0.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
-EBUILD imageio-2.21.1.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
-EBUILD imageio-2.21.2.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
-EBUILD imageio-2.22.0.ebuild 1210 BLAKE2B 2a8b74196d15dfd56fc549f5a90bbaf46c335d0c8d471b025a47780e46b42285b87b6041b57dfe7266bfc13cc00191361d07780eb1f9b519bff57a5adc3eb517 SHA512 e9346ba2129ad538ac3bc59ddaec6069afcbacaf1bc0cae5d26997e670a111ad8892e8bcda84b58010882d9810896410d6b2577b2a5ff9ffb070b9dd13961e56
+DIST imageio-chelsea.png 221294 BLAKE2B 58537d7a1678fa5be4cc899e5bacd925bfc180eb4ae691330a53749a49ff544e979609b529ed27e5c1fc9efe4bc050ca1ce49b777f4016fb1d66affd926ef9d3 SHA512 48470cdb843eed4dfa6673811c09c5aac9869ee23dd36be0c6b653d9f108d61d21b148c2a4435aaa6604887ba030e5bbc5e35d378da876366445dfc2d0ba4e27
+DIST imageio-cockatoo.mp4 728751 BLAKE2B 45b22cd517c1cb7c0cd12f8865facaca6a847047aea716e49633cf2b1dc13826f94787c8a8f9dd5f48c6a896f5d37794c0058da1bde9e1469f196916476dbfa2 SHA512 e9cb7c25de8019c59ba4090cf10ab29f2b5d62ada37a877081ca07d2ecfe010036222ae843b41bbcc843130d97fa5e14421de252639e9481df1d1c27b19add49
+EBUILD imageio-2.22.0-r1.ebuild 2023 BLAKE2B 4599e2d73deb63ae4e4178a5e67f8f1111c52ca027bf7f51ebc4ec0ce7e930ac95243737ded30fac945555b824dd24262f522453393e6c416750fe0769434447 SHA512 7c9b11cc6672abe2acb2d1dbf471dce918dd02e105510edca0a7b7a9c4c2218546d802912c977b045fe9ba86fdbb8b8e1a4941b944786a9e9516ac638957bcb4
MISC metadata.xml 959 BLAKE2B 284b4b8fdf53cc63b6d46d1afd03abf322f8a91ad5feac3828c30198a9e0baa1514f34b91385dbc00830b306e4f78eac5d2bf4be8e377fe98cfb7e5c8db896be SHA512 0a72e91831dec56af50fa96fc6ed74b19fdc15e68255d19fb09c542eea85cfcdaa5a382608add10a63d3e421783225829d20d9b31c26883f7640b6214f2c20e3
diff --git a/dev-python/imageio/files/imageio-2.22.0-block-download.patch b/dev-python/imageio/files/imageio-2.22.0-block-download.patch
new file mode 100644
index 000000000000..ba483813b23c
--- /dev/null
+++ b/dev-python/imageio/files/imageio-2.22.0-block-download.patch
@@ -0,0 +1,32 @@
+From 1ae48cfa95e84cb064edc74a4a64bd0f7dee780a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 4 Oct 2022 09:40:42 +0200
+Subject: [PATCH] Unconditionally disable downloading binaries from Internet
+
+Bug: https://bugs.gentoo.org/874849
+---
+ imageio/core/fetching.py | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/imageio/core/fetching.py b/imageio/core/fetching.py
+index 0380bc7..70f1a3d 100644
+--- a/imageio/core/fetching.py
++++ b/imageio/core/fetching.py
+@@ -97,11 +97,10 @@ def get_remote_file(fname, directory=None, force_download=False, auto=True):
+ break
+
+ # If we get here, we're going to try to download the file
+- if os.getenv("IMAGEIO_NO_INTERNET", "").lower() in ("1", "true", "yes"):
++ if True:
+ raise InternetNotAllowedError(
+- "Will not download resource from the "
+- "internet because environment variable "
+- "IMAGEIO_NO_INTERNET is set."
++ "Implicit insecure downloads disabled on Gentoo due to security "
++ "concerns. See https://bugs.gentoo.org/874849."
+ )
+
+ # Can we proceed with auto-download?
+--
+2.38.0
+
diff --git a/dev-python/imageio/imageio-2.21.1.ebuild b/dev-python/imageio/imageio-2.21.1.ebuild
deleted file mode 100644
index 6770d9759db9..000000000000
--- a/dev-python/imageio/imageio-2.21.1.ebuild
+++ /dev/null
@@ -1,52 +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
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
- https://imageio.readthedocs.io/en/stable/
- https://github.com/imageio/imageio/
- https://pypi.org/project/imageio/
-"
-SRC_URI="
- https://github.com/imageio/imageio/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
- >=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
- >=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
- media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
- test? (
- dev-python/fsspec[${PYTHON_USEDEP}]
- dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/tifffile[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- # Fails because of system installed freeimage
- tests/test_core.py::test_findlib2
- # Tries to download ffmpeg binary ?!
- tests/test_ffmpeg.py::test_get_exe_installed
-)
diff --git a/dev-python/imageio/imageio-2.21.2.ebuild b/dev-python/imageio/imageio-2.21.2.ebuild
deleted file mode 100644
index 6770d9759db9..000000000000
--- a/dev-python/imageio/imageio-2.21.2.ebuild
+++ /dev/null
@@ -1,52 +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
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
- https://imageio.readthedocs.io/en/stable/
- https://github.com/imageio/imageio/
- https://pypi.org/project/imageio/
-"
-SRC_URI="
- https://github.com/imageio/imageio/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
- >=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
- >=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
- media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
- test? (
- dev-python/fsspec[${PYTHON_USEDEP}]
- dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/tifffile[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- # Fails because of system installed freeimage
- tests/test_core.py::test_findlib2
- # Tries to download ffmpeg binary ?!
- tests/test_ffmpeg.py::test_get_exe_installed
-)
diff --git a/dev-python/imageio/imageio-2.21.0.ebuild b/dev-python/imageio/imageio-2.22.0-r1.ebuild
index 6770d9759db9..20bd98f88e7f 100644
--- a/dev-python/imageio/imageio-2.21.0.ebuild
+++ b/dev-python/imageio/imageio-2.22.0-r1.ebuild
@@ -8,6 +8,7 @@ PYTHON_COMPAT=( python3_{8..10} )
inherit distutils-r1
+BIN_COMMIT=224074bca448815e421a59266864c23041531a42
DESCRIPTION="Python library for reading and writing image data"
HOMEPAGE="
https://imageio.readthedocs.io/en/stable/
@@ -17,6 +18,12 @@ HOMEPAGE="
SRC_URI="
https://github.com/imageio/imageio/archive/v${PV}.tar.gz
-> ${P}.gh.tar.gz
+ test? (
+ https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/chelsea.png
+ -> ${PN}-chelsea.png
+ https://github.com/imageio/imageio-binaries/raw/${BIN_COMMIT}/images/cockatoo.mp4
+ -> ${PN}-cockatoo.mp4
+ )
"
LICENSE="MIT"
@@ -44,9 +51,31 @@ BDEPEND="
distutils_enable_tests pytest
+src_prepare() {
+ local PATCHES=(
+ # block silently downloading vulnerable libraries from the Internet
+ "${FILESDIR}"/imageio-2.22.0-block-download.patch
+ )
+
+ if use test; then
+ mkdir -p "${HOME}"/.imageio/images || die
+ local i
+ for i in chelsea.png cockatoo.mp4; do
+ cp "${DISTDIR}/${PN}-${i}" "${HOME}/.imageio/images/${i}" || die
+ done
+ fi
+
+ distutils-r1_src_prepare
+}
+
EPYTEST_DESELECT=(
# Fails because of system installed freeimage
tests/test_core.py::test_findlib2
# Tries to download ffmpeg binary ?!
tests/test_ffmpeg.py::test_get_exe_installed
+ # blocked by our patch
+ tests/test_core.py::test_fetching
+ tests/test_core.py::test_request
+ # removed upstream
+ tests/test_pillow.py::test_png_remote
)
diff --git a/dev-python/imageio/imageio-2.22.0.ebuild b/dev-python/imageio/imageio-2.22.0.ebuild
deleted file mode 100644
index 6770d9759db9..000000000000
--- a/dev-python/imageio/imageio-2.22.0.ebuild
+++ /dev/null
@@ -1,52 +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
-
-DESCRIPTION="Python library for reading and writing image data"
-HOMEPAGE="
- https://imageio.readthedocs.io/en/stable/
- https://github.com/imageio/imageio/
- https://pypi.org/project/imageio/
-"
-SRC_URI="
- https://github.com/imageio/imageio/archive/v${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# over 50% of tests rely on Internet
-PROPERTIES="test_network"
-RESTRICT="test"
-
-RDEPEND="
- >=dev-python/numpy-1.20.0[${PYTHON_USEDEP}]
- >=dev-python/pillow-8.3.2[${PYTHON_USEDEP}]
- media-libs/freeimage
-"
-# requests for fsspec[github]
-BDEPEND="
- test? (
- dev-python/fsspec[${PYTHON_USEDEP}]
- dev-python/imageio-ffmpeg[${PYTHON_USEDEP}]
- dev-python/psutil[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/tifffile[${PYTHON_USEDEP}]
- )
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
- # Fails because of system installed freeimage
- tests/test_core.py::test_findlib2
- # Tries to download ffmpeg binary ?!
- tests/test_ffmpeg.py::test_get_exe_installed
-)
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 2034cac7a954..8ae1a41cf12d 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -10,5 +10,5 @@ DIST matplotlib-3.6.0.tar.gz 35749946 BLAKE2B 1e2e80e124ef1a0a1843ba077c3c933b55
EBUILD matplotlib-3.5.1-r2.ebuild 7230 BLAKE2B 003f7562ce03d398eecf1bc7cb9485b9109e6ab88a8277dcc26e34ecaee2e452f4af6ab34ff5c8de06c3c1548032cda3ecda9bf8bae635cceb4b4d2d8039b1a7 SHA512 7a325460d335521a132eb30594ea36a910c153f19ecac66303402e2821d0ab130f1fa91a69ae90a6a1746378876234f54d8c05c0695c09a827453c83e7d0b345
EBUILD matplotlib-3.5.2-r3.ebuild 7391 BLAKE2B 59b395f4d3384793dd72c633e98ea71f64656042b398a2af2d25689285534c047e572779f4e966913c912870c747488d6e9d062766d980e7dd53fdad01647188 SHA512 2dc2ca8a5a7cd7fd679800bfef9208e7679b9bcb4bd267993d9369f00a2c09e6ca0f1abd30d9dfd3712e869b205e1945f29f008f41c5c77e7c506c10fd2fdea2
EBUILD matplotlib-3.5.3.ebuild 7446 BLAKE2B c49d5f0ce2d14d6c621746217415103d06a1cc6d0c0d682c373eec20d0af0167a55b00ba582df7d7f3745de00692e254547e721aa25dc363261ffd6297424274 SHA512 a474eafc8ec34b70535e889b4ce5606a2ad3a682308346bb5b26868f13a84e31291fdd77b3f522883faefafa1f4f0d6ce2cf399bc9bacbc584ced8a3fabf07da
-EBUILD matplotlib-3.6.0-r1.ebuild 7464 BLAKE2B b0dcd0d4b13927c0ece6c30e232f3b680cf9c56f62c248e674bfb2061d598e7e7f61613601e0257dce5241730d0fe86b6ff379822400ecf3b5fcacc4e1774913 SHA512 1b640f28bbc65622c37fffff99b503f196ed873dfd6dba7bd23ad72b6e678c00dcb3d7ee7d8eb44552cedcfecede761eb106dddeaf61fc84536f7fc88361c889
+EBUILD matplotlib-3.6.0-r1.ebuild 7469 BLAKE2B b4ab7c3adeed6690a3e66f784fffcc996ac5bcd4437af1feab7a5e94ecd2c7c9008aad58467e248dd20cb200fd2fead39c29cfcd0413eb28add9b27fe8593f34 SHA512 483c6beb7d91cfbc3c7cfb4198a78a71acc79bfea559c32d2e202586cac54e1fef2b7fec090b81303ae19b0199f5d7a774c7f52b74400c6627ff15cf13465f5d
MISC metadata.xml 1074 BLAKE2B 1d7dce116e09939378872c2eaf5153948b7e934626110eb4899d0dfc2781429522328f1c4efd2c40f829da64e19bed8f9fbd1b8907a6e74a5fd54587c1d29e5b SHA512 e344bfc813e09c24a8edfa9c062eb2a6c44535559370f508a27a2de20c6ab92aeb48bc8daf9c357178e513eb2474a33782e4098c0f3bcbb84b11f7388ef1a704
diff --git a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
index 031baed90541..c3d021be8147 100644
--- a/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.6.0-r1.ebuild
@@ -30,7 +30,7 @@ SRC_URI="
# Fonts: BitstreamVera, OFL-1.1
LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~riscv"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~riscv"
IUSE="cairo doc excel examples gtk3 latex qt5 tk webagg wxwidgets"
# internal copy of pycxx highly patched
diff --git a/dev-python/python-rtmidi/Manifest b/dev-python/python-rtmidi/Manifest
index cc9b91e41419..f85badca05c8 100644
--- a/dev-python/python-rtmidi/Manifest
+++ b/dev-python/python-rtmidi/Manifest
@@ -1,4 +1,4 @@
-AUX python-rtmidi-1.4.9-unbundle_rtmidi.patch 2139 BLAKE2B 04782e01de9d01a9f4d44c7f856527173227da94f81d2b7338c1e437194be53d0130bb8b03bd3fdc5b7e71d58f7514f476e817066ce5ce80dd530e78a355e2ab SHA512 d02951fe7f84a9b356765a734bdaa010a56562a86cdc1b54077ad25359339fb299080727f59f95273e842ad537192192f0705806d76f6aaf6022d36a0355ab53
+AUX python-rtmidi-1.4.9-unbundle_rtmidi.patch 2137 BLAKE2B b27c438fa93c00fd458fd8083302838ad0ca96c09c89f0993c6fdc09681f8eccddca53445925c1b437860faa488115d2bc33076a202a5dd730f44cef298c9831 SHA512 6d42f2fe1d533d85ae7ac32b903fc087d4932904905fd778e1979aaed3d4dd6e45db4a49ab87089d67a68ac24b724ef0c7e52eb815badb98d972d3de8cd70677
DIST python-rtmidi-1.4.9.tar.gz 251238 BLAKE2B dda4052e893839f88a6756306f8ff4e89ee66ad9716d374efbb7b92a8e9074e98c8d5df0cc82aa3c6e0c77a78fe9b997079623a5147c03eeea9128dfb7605215 SHA512 91c5a0f807549fbe9d87df6e40b8c3db0f9be753616ba51804900195d02120cd972e39c69dd99e60e4ea1b1d9831d0b956b64ce71b2fe03422efc57bccf5cb70
EBUILD python-rtmidi-1.4.9.ebuild 1168 BLAKE2B 688b922cd52b746cea5ba0b0d747afdf6b43f355f2823c31de653cec500a156f2f8523df34010a3b6b6eba6c77064efea96236bb2be129af51915c603b28266d SHA512 1008bf277276c1daf1dc1a757a190f1bf53497d6618fbaa5f6e54ade77b6ead54b87e5c737f6d9ff8fb835e2096fb5b6058cfbbf0e09d5578f2cd5af6ea0aabe
MISC metadata.xml 388 BLAKE2B b1bce0f609aae5a298c26c80c3dc3aa33eadf32c9de9da22f4a4f808d1cfd8c769b095d12f2264cf9dd04cdbec8a0fb7202b10c04bb43f9112146023aadd398d SHA512 012ad743d364b9266bef852d159235f27b172ec7fceff43737fe8a67478f991dc53532b021c02d8ffc2eea19cdc568046cf90e440afefb46dcdad275a33f71e3
diff --git a/dev-python/python-rtmidi/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch b/dev-python/python-rtmidi/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch
index ecd9f53b108c..45cece4b2eb9 100644
--- a/dev-python/python-rtmidi/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch
+++ b/dev-python/python-rtmidi/files/python-rtmidi-1.4.9-unbundle_rtmidi.patch
@@ -9,25 +9,24 @@
elif exists(join(SRC_DIR, "_rtmidi.cpp")):
cythonize = lambda x: x # noqa
sources = [join(SRC_DIR, "_rtmidi.cpp"), join(SRC_DIR, "rtmidi", "RtMidi.cpp")]
-@@ -145,18 +145,18 @@
+@@ -145,18 +145,13 @@
if sys.platform.startswith('linux'):
- if alsa and find_library('asound'):
- define_macros.append(("__LINUX_ALSA__", None))
- libraries.append('asound')
--
-- if jack:
-- check_for_jack(define_macros, libraries)
--
- if not find_library('pthread'):
- sys.exit("The 'pthread' library is required to build python-rtmidi on"
- "Linux. Please install the libc6 development package.")
+ if not find_library('rtmidi'):
+ sys.exit("Failed to find librtmidi")
- libraries.append("pthread")
-+
+- if jack:
+- check_for_jack(define_macros, libraries)
+-
+- if not find_library('pthread'):
+- sys.exit("The 'pthread' library is required to build python-rtmidi on"
+- "Linux. Please install the libc6 development package.")
+-
+- libraries.append("pthread")
+ res = subprocess.check_output(['pkg-config', '--variable', 'includedir', 'rtmidi'])
+ rtmidi_include_dir = res.decode().strip()
+ include_dirs.append(rtmidi_include_dir)
@@ -35,7 +34,7 @@
elif sys.platform.startswith('darwin'):
if jack:
check_for_jack(define_macros, libraries)
-@@ -197,7 +197,7 @@
+@@ -197,7 +192,7 @@
# Finally, set up our distribution
setup(
packages=['rtmidi'],
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 79445220f156..c9006bac3473 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,5 +1,3 @@
-DIST qtconsole-5.3.1.tar.gz 430680 BLAKE2B 4655d9aa78a95200fb3f4d2016749d4f1c75865d259da8583818259d05301469b9851b85a2716336084f022f546e97ae003483284f0305793da80a5de7635ac2 SHA512 bebf9c97ebe2a030feebd34f9dbc83294af5eb64946b252c5b5e6391e2760ff95efa7f0be89ec59c424de5fefb3f876ead897d17b679fc87896fe440ba936554
DIST qtconsole-5.3.2.tar.gz 430792 BLAKE2B 246dadaab92851f8da65dfa4c7e80390defeb0855fdb3ea5ef6aab96bf56b28597dc65d7cb4fc95f0f795a19f4b826d0ec1e1e0b025f4fa49d4d5a78473a2b29 SHA512 715e7e4b185a656f395a30c575e8996271cea4672871d9471c74a13364be1ef0fe0e63951e8f52f10b9c887592dc899c399ae82e09f9934492d13119b1154796
-EBUILD qtconsole-5.3.1.ebuild 1593 BLAKE2B 34ba6800a4d3fead61d6fd3519c0f861dee511cf9ffe47e6396585977163a2992f0d8d59525c20ce99db0edcd387cad79d8d268aa55a29c91965970fdaa8fa36 SHA512 5ef7817012f6dbcec0443b3c8671a513fc90e6ef8dd1b8117106c545cfe70f88948dac35242b563b302fd4a6a013bcea89923c35be047dd3594eaf1c87d8bbf5
EBUILD qtconsole-5.3.2.ebuild 1593 BLAKE2B 34ba6800a4d3fead61d6fd3519c0f861dee511cf9ffe47e6396585977163a2992f0d8d59525c20ce99db0edcd387cad79d8d268aa55a29c91965970fdaa8fa36 SHA512 5ef7817012f6dbcec0443b3c8671a513fc90e6ef8dd1b8117106c545cfe70f88948dac35242b563b302fd4a6a013bcea89923c35be047dd3594eaf1c87d8bbf5
MISC metadata.xml 690 BLAKE2B f2ddc6515f66ac4549e99bd6f152c16431875508bf12b6319e0e6a2b1596d86abc50b87ee424d3876eb55e92d1a506ade6567cbad535b4b2b54fad924a1891a7 SHA512 28bb7360ac7775d9c72c4d0f34d4c9a35c63905c4e870722236cc6c66e98f6c0eb165c8d7a9ce28948b25808a053dd1bb667d1f4783ca95319bb216310dc9f60
diff --git a/dev-python/qtconsole/qtconsole-5.3.1.ebuild b/dev-python/qtconsole/qtconsole-5.3.1.ebuild
deleted file mode 100644
index a596e5db94b6..000000000000
--- a/dev-python/qtconsole/qtconsole-5.3.1.ebuild
+++ /dev/null
@@ -1,59 +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} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="
- https://jupyter.org/
- https://github.com/jupyter/qtconsole/
- https://pypi.org/project/qtconsole/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
- >=dev-python/ipykernel-4.1[${PYTHON_USEDEP}]
- dev-python/ipython_genutils[${PYTHON_USEDEP}]
- dev-python/jupyter_core[${PYTHON_USEDEP}]
- >=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- >=dev-python/pyzmq-17.1[${PYTHON_USEDEP}]
- >=dev-python/traitlets-5.2.2_p1[${PYTHON_USEDEP}]
- >=dev-python/QtPy-2.0.1[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-# The test suite tests both against pyqt5 *and* pyside2
-BDEPEND="
- test? (
- dev-python/QtPy[pyqt5,pyside2,${PYTHON_USEDEP},svg,testlib]
- )
-"
-# required by the tests that are removed:
-# dev-python/flaky[${PYTHON_USEDEP}]
-# dev-python/pytest-qt[${PYTHON_USEDEP}]
-
-PDEPEND="
- dev-python/ipython[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_test() {
- # TODO: these tests require virtx; however, running under virtx
- # causes pytest to segv on exit (even though tests pass)
- EPYTEST_IGNORE=(
- qtconsole/tests/test_00_console_widget.py
- qtconsole/tests/test_jupyter_widget.py
- )
- epytest
-}