commit: de879cad418f2e55fb037c9a063dde7c3ae3dec3
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 4 18:01:25 2020 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Mar 4 18:01:50 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de879cad
sci-chemistry/pymol: pymol works with py3
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org>
sci-chemistry/pymol/pymol-2.3.0-r2.ebuild | 1 -
.../pymol/{pymol-2.3.0-r2.ebuild => pymol-2.3.0-r3.ebuild} | 10 ++--------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild
b/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild
index 36cc913f7b0..5eadc9a8512 100644
--- a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild
+++ b/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild
@@ -29,7 +29,6 @@ DEPEND="
dev-python/pmw:py2[${PYTHON_USEDEP}]
dev-python/pyopengl[${PYTHON_USEDEP}]
dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
media-libs/freetype:2
media-libs/glew:0=
media-libs/glm
diff --git a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild
b/sci-chemistry/pymol/pymol-2.3.0-r3.ebuild
similarity index 92%
copy from sci-chemistry/pymol/pymol-2.3.0-r2.ebuild
copy to sci-chemistry/pymol/pymol-2.3.0-r3.ebuild
index 36cc913f7b0..675c8b36880 100644
--- a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild
+++ b/sci-chemistry/pymol/pymol-2.3.0-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
inherit distutils-r1 desktop eutils flag-o-matic xdg-utils
@@ -22,11 +22,6 @@ IUSE="web"
DEPEND="
dev-libs/msgpack[cxx]
dev-libs/mmtf-cpp
- || (
- dev-python/numpy-python2[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- )
- dev-python/pmw:py2[${PYTHON_USEDEP}]
dev-python/pyopengl[${PYTHON_USEDEP}]
dev-python/PyQt5[opengl,${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
@@ -36,8 +31,7 @@ DEPEND="
media-libs/libpng:0=
media-video/mpeg-tools
sys-libs/zlib
- !sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
- web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
+"
RDEPEND="${DEPEND}
sci-chemistry/chemical-mime-data
"
