summaryrefslogtreecommitdiff
path: root/sci-chemistry/pymol
diff options
context:
space:
mode:
Diffstat (limited to 'sci-chemistry/pymol')
-rw-r--r--sci-chemistry/pymol/Manifest4
-rw-r--r--sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild9
-rw-r--r--sci-chemistry/pymol/pymol-2.3.0-r1.ebuild9
3 files changed, 14 insertions, 8 deletions
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index ada63596e3b8..96c47bd5615f 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,6 +1,6 @@
DIST pymol-1.8.4.0.png.xz 19528 BLAKE2B f3d23d4cedca3d8bb96b20646a548da4be570697e3346a11b01c5c3599b536ba4697be08472dfa8a4f6533167defc1a37a1de332931a73857319cb28fd42cd2b SHA512 40bb0d3f226476f6e047b5361956aad955232a97641474765eaa5204f0539aee3810e0266213618a45364f9f31f6eb18380b17e0c79f64065f7b62a9016caa7c
DIST pymol-2.3.0.tar.gz 10448674 BLAKE2B 0d508587d880ce7f2e8a0481bf664e6bfe6eb1d68b0f48b9266cde756824bd8c0144d7243e958bbc5e571d60fca9dafff125d81a8a3d32107e78ad2ff8dffc05 SHA512 e1dcea1c97bcd9045d3543e92902f240e6affbf61a38e8d2a0be04309e3dbabfe1a869847d1423b3151008978d4c305bbf3ce994fc9d453c0063ce020100c133
DIST pymol-v1.8.4.0.tar.bz2 8717344 BLAKE2B a4cfb95eb40a3cd3da5b8cfd4acac7255997f9a3e49ef7e7e1d4c13f36e4aace462a054c326bbaadbc99f22286be878a6d5c518149760b5c939ce9362d4b8cc3 SHA512 73a810adfc31adaf0f3fa25512084882c87b0782c8af716ac0203a5b5b7f0b9fedfbce3d129bffef7b52044e92b0542e683966b2acf961c4dac17fbba72dd7fe
-EBUILD pymol-1.8.4.0-r1.ebuild 3009 BLAKE2B c3bbbab87fdb018448d0150e130abba4572280e2fbe7473266477a5c32cc37a5c8907cfd0f99e001da7fa488dd195f2f8e084c5e0443664cd85741ee85990888 SHA512 d108605302c023c077748aaa21c2cf0a1e8a5d05505315de2937eca112036bd60263b7d704baffe605956a15ebddeeb4c3073a857810f1a87f726a95b5397588
-EBUILD pymol-2.3.0-r1.ebuild 3134 BLAKE2B 9013a9ac9e66afac23f3a6c413e6fe484193d6fed0a546d8f07a274fdbc49f847cda50fe0d06d427677a61cd41d7a6fa3547a1f2d8abb84984be090d39d07ad6 SHA512 cff3bd25db982b6171fa531479ea9890c8ef60c869e0265a36b59c357e4bc3df48e124a69daf0e011c73f7ebf6f44f3fb54990df285ecb408332f239ceb958f8
+EBUILD pymol-1.8.4.0-r1.ebuild 3062 BLAKE2B 98914bfee561a1f5970ca47180ae5a23ac9c547069bfa421041c4e19eaff9820ab148038406971ac8e79801f99fdd92f90e7be5249081ba1be200451efb92f30 SHA512 69714e4d11ab56af06fee425e23659b9855e2f8e39293888a57720e6c1f4dad8f823cb77f203f7bb55f3b402f899e810c73af150106621c2e8ee6cd0c4250e5f
+EBUILD pymol-2.3.0-r1.ebuild 3190 BLAKE2B a72434867a8589dda7a334f71e1aaa58f16d3caea1eb1615c44c2b813b1d0b84ed308369eb89c45251daf7bfbabed470e7d5abe42334b3fe28b484217fa29653 SHA512 5c2d08baa9407a2abe733d1753e622ea450b7c939b4f57d8e47adb5f57ac5a5e2b95264b6876698c70a5af926d378d75b6ba4ae02c85affbcfda7327d718ea14
MISC metadata.xml 439 BLAKE2B 68df7dfc8ca3d4d4b18b419532bade69491f2e9362f10ae2397c804132b7fc9cd08dcf9703c0a89c44588c570e0c0c1bb9bffb7394d51faf1283142dbc5f70b3 SHA512 f5a3eded9b12fa715ba2e6e10b41c75d9bd823ca0dd40acbffc3f5bfc4b36c687f720b1a4e119b4540a31faf849985778cbd72b0b2cd35af8c52ca0f808d71e4
diff --git a/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild b/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild
index 0bcafb2e3223..f60de8dcb189 100644
--- a/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.8.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="tk"
inherit distutils-r1 eutils fdo-mime flag-o-matic versionator
DESCRIPTION="A Python-extensible molecular graphics system"
-HOMEPAGE="http://www.pymol.org/"
+HOMEPAGE="https://www.pymol.org/"
SRC_URI="
https://dev.gentoo.org/~jlec/distfiles/${P}.png.xz
mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-2)/${PN}-v${PV}.tar.bz2
@@ -22,7 +22,10 @@ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="web"
DEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
dev-python/pmw:py2[${PYTHON_USEDEP}]
dev-python/pyopengl[${PYTHON_USEDEP}]
media-libs/freeglut
diff --git a/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild b/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild
index b84c27698061..6e8433b403ec 100644
--- a/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild
+++ b/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 desktop eutils flag-o-matic xdg-utils
DESCRIPTION="A Python-extensible molecular graphics system"
-HOMEPAGE="http://www.pymol.org/"
+HOMEPAGE="https://www.pymol.org/"
SRC_URI="
https://dev.gentoo.org/~jlec/distfiles/${PN}-1.8.4.0.png.xz
https://github.com/schrodinger/pymol-open-source/archive/v${PV}.tar.gz -> ${P}.tar.gz
@@ -22,7 +22,10 @@ IUSE="web"
DEPEND="
dev-libs/msgpack[cxx]
dev-libs/mmtf-cpp
- dev-python/numpy[${PYTHON_USEDEP}]
+ || (
+ 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}]