Merge branch 'edge' into next

3 files changed, 62 insertions, 0 deletions

diff --git a/dev-python/pyqtgraph/Manifest b/dev-python/pyqtgraph/Manifest
index b17bfdecf3ca..c46bbd2cbb72 100644
--- a/dev-python/pyqtgraph/Manifest
+++ b/dev-python/pyqtgraph/Manifest
@@ -1,4 +1,7 @@
 AUX pyqtgraph-0.10.0-qt5.patch 439 BLAKE2B 8c0b5f766adf64d67800873145223ed8f9dda75ce1d5d62784129d827c4dfb9d44bd5532b44dbe42abc6bd67d5b13082c1691d8796c3a53b4ea873faaa2d7f00 SHA512 792a739e1cdc2c7c1ce059945c4a5280f1187a88dd767669fee83fbbdb5c315c022b99c5312c9c53d88afc6d24767fcb93426f6e05b9a5d08db084ba3110cc93
+AUX pyqtgraph-0.11.0-qt5_only.patch 361 BLAKE2B 5c4f904df6b19bcf29c9e44a623400015b1ebe4cac8b797a50478e75c82ac964cb05ca4c67dfa73332528e4f232f612d2f9a9bf439dbaf63765fb1f6d650bd77 SHA512 34600cdbb1e361288393fecfd8740b147ef16dfcd0719f0eed62a93201eb5fd54b09aebb86201effe6a791a6b5be934ece07a07756284ae0b2bbde4aaee137dd
 DIST pyqtgraph-0.10.0.tar.gz 704972 BLAKE2B cb1295608536b06de32ea72503b2df2be7f4ae3065b42431542539feec5eb37412e3a7697e2ee97309594b9aecc19c692ef7b45f843f37bd50148a3c0b6e1d31 SHA512 d995da7b4f13ae0009582aebe3f753dc78566dc50ba9314d3a2d37ad4ed8f2fd8bb497a01bb8b37b6d96bf14c071aad018bcbc7224d9dd9b47589a7b5b640d30
+DIST pyqtgraph-0.11.0_rc0.tar.gz 755973 BLAKE2B 845c57a16c71d449419cca452ac70468eb21f198b3aebe39204e8ac1408ebd4471a95b24cbd91cd4c745439c17a805738e50a29f8690de5d84f86c2597310aea SHA512 6eb5573b19c7fc0bc263bdc5d75a9a7a5d86d5ce525e406fcbd8f4215a8b2a0a9a7d4839d177fb10ff62a5feacdf088347828900daa9f60ae84e54824b98f470
 EBUILD pyqtgraph-0.10.0-r2.ebuild 1219 BLAKE2B 6eeeeb6d25de6d0d791b760569eceafb34b5a0fa65af24a100cf9540ae45e0d8df327787f80581ac31504f6be32b5695a03e0238c290cdef6b62774ab5ad03fd SHA512 b5742c766f27a517867fbbe1b1b95204c984636f52975a47a070f00c739e3b4c300d7c160bb1558fcc8865b72e6c64de05ab4007b859634c432ccf1b7df2bf39
+EBUILD pyqtgraph-0.11.0_rc0.ebuild 1074 BLAKE2B 210fd58f645c5803ca33701b3d529b3924a3302faf8f16076e26fc173d5fc4c38a70deec546b24f343bbf55a9c0d69c96a02803d48f44d0e60afd1ffc97e3c9c SHA512 f6ccb6c519aae5f2f943f91f0c813c6e398f6203a21faea3e76c7c4c49742b4afda86b8981b22afef012cecbf4bde490d7accc853bad0504e65686eab475628b
 MISC metadata.xml 725 BLAKE2B 0126a36d5645e5fa0ddcbc46924f78284cb03de5632f84a790415278a91ab650b2e3c7994467e106a0bc4e900f98b0f40ca70416ea2d515b15d4f74320600e70 SHA512 51fdf4a875bc629230c1040ae34cc6b37225dcd18c04a23d3bb6b5da30c79dd7d4c10ee46fd671941d86ee15d548e7a0303bcb48e7796b20036ebb928ebd9078
diff --git a/dev-python/pyqtgraph/files/pyqtgraph-0.11.0-qt5_only.patch b/dev-python/pyqtgraph/files/pyqtgraph-0.11.0-qt5_only.patch
new file mode 100644
index 000000000000..1e65b0de9264
--- /dev/null
+++ b/dev-python/pyqtgraph/files/pyqtgraph-0.11.0-qt5_only.patch
@@ -0,0 +1,11 @@
+--- a/pyqtgraph/Qt.py
++++ b/pyqtgraph/Qt.py
+@@ -25,7 +25,7 @@
+ ## This is done by first checking to see whether one of the libraries
+ ## is already imported. If not, then attempt to import PyQt4, then PySide.
+ if QT_LIB is None:
+-    libOrder = [PYQT4, PYSIDE, PYQT5, PYSIDE2]
++    libOrder = [PYQT5]
+ 
+     for lib in libOrder:
+         if lib in sys.modules:
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
new file mode 100644
index 000000000000..f13ada12b645
--- /dev/null
+++ b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+MY_PV=$(ver_rs 3 "")
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="A pure-python graphics and GUI library built on PyQt and numpy"
+HOMEPAGE="http://www.pyqtgraph.org/ https://pypi.org/project/pyqtgraph/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples opengl svg"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
+	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.11.0-qt5_only.patch
+)
+
+DOCS=( CHANGELOG README.md )
+
+S="${WORKDIR}"/${PN}-${MY_P}
+
+distutils_enable_sphinx doc/source
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if ! use opengl; then
+		rm -r pyqtgraph/opengl || die
+	fi
+}
+
+python_install_all() {
+	use examples && DOCS+=( examples/ )
+	distutils-r1_python_install_all
+}