| 1 |
commit: de879cad418f2e55fb037c9a063dde7c3ae3dec3 |
| 2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 4 18:01:25 2020 +0000 |
| 4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 4 18:01:50 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de879cad |
| 7 |
|
| 8 |
sci-chemistry/pymol: pymol works with py3 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.88, Repoman-2.3.20 |
| 11 |
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-chemistry/pymol/pymol-2.3.0-r2.ebuild | 1 - |
| 14 |
.../pymol/{pymol-2.3.0-r2.ebuild => pymol-2.3.0-r3.ebuild} | 10 ++-------- |
| 15 |
2 files changed, 2 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild b/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild |
| 18 |
index 36cc913f7b0..5eadc9a8512 100644 |
| 19 |
--- a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild |
| 20 |
+++ b/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild |
| 21 |
@@ -29,7 +29,6 @@ DEPEND=" |
| 22 |
dev-python/pmw:py2[${PYTHON_USEDEP}] |
| 23 |
dev-python/pyopengl[${PYTHON_USEDEP}] |
| 24 |
dev-python/PyQt5[opengl,${PYTHON_USEDEP}] |
| 25 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 26 |
media-libs/freetype:2 |
| 27 |
media-libs/glew:0= |
| 28 |
media-libs/glm |
| 29 |
|
| 30 |
diff --git a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild b/sci-chemistry/pymol/pymol-2.3.0-r3.ebuild |
| 31 |
similarity index 92% |
| 32 |
copy from sci-chemistry/pymol/pymol-2.3.0-r2.ebuild |
| 33 |
copy to sci-chemistry/pymol/pymol-2.3.0-r3.ebuild |
| 34 |
index 36cc913f7b0..675c8b36880 100644 |
| 35 |
--- a/sci-chemistry/pymol/pymol-2.3.0-r2.ebuild |
| 36 |
+++ b/sci-chemistry/pymol/pymol-2.3.0-r3.ebuild |
| 37 |
@@ -3,7 +3,7 @@ |
| 38 |
|
| 39 |
EAPI=7 |
| 40 |
|
| 41 |
-PYTHON_COMPAT=( python2_7 ) |
| 42 |
+PYTHON_COMPAT=( python3_{6,7} ) |
| 43 |
|
| 44 |
inherit distutils-r1 desktop eutils flag-o-matic xdg-utils |
| 45 |
|
| 46 |
@@ -22,11 +22,6 @@ IUSE="web" |
| 47 |
DEPEND=" |
| 48 |
dev-libs/msgpack[cxx] |
| 49 |
dev-libs/mmtf-cpp |
| 50 |
- || ( |
| 51 |
- dev-python/numpy-python2[${PYTHON_USEDEP}] |
| 52 |
- dev-python/numpy[${PYTHON_USEDEP}] |
| 53 |
- ) |
| 54 |
- dev-python/pmw:py2[${PYTHON_USEDEP}] |
| 55 |
dev-python/pyopengl[${PYTHON_USEDEP}] |
| 56 |
dev-python/PyQt5[opengl,${PYTHON_USEDEP}] |
| 57 |
dev-python/numpy[${PYTHON_USEDEP}] |
| 58 |
@@ -36,8 +31,7 @@ DEPEND=" |
| 59 |
media-libs/libpng:0= |
| 60 |
media-video/mpeg-tools |
| 61 |
sys-libs/zlib |
| 62 |
- !sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}] |
| 63 |
- web? ( !dev-python/webpy[${PYTHON_USEDEP}] )" |
| 64 |
+" |
| 65 |
RDEPEND="${DEPEND} |
| 66 |
sci-chemistry/chemical-mime-data |
| 67 |
" |
Archives