1 |
commit: dd358f4227f9021e21150582702536055324017b |
2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 1 08:37:56 2019 +0000 |
4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 1 08:37:56 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd358f42 |
7 |
|
8 |
sci-chemistry/pymol: Change deps |
9 |
|
10 |
Now pymol depends on PyQt5, since freeglut interface is deprecated |
11 |
|
12 |
Package-Manager: Portage-2.3.67, Repoman-2.3.13 |
13 |
Signed-off-by: Alexey Shvetsov <alexxy <AT> gentoo.org> |
14 |
|
15 |
sci-chemistry/pymol/Manifest | 1 - |
16 |
sci-chemistry/pymol/pymol-2.2.0.ebuild | 114 --------------------- |
17 |
.../{pymol-2.3.0.ebuild => pymol-2.3.0-r1.ebuild} | 7 +- |
18 |
3 files changed, 3 insertions(+), 119 deletions(-) |
19 |
|
20 |
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest |
21 |
index 4e293b43050..ab400768a37 100644 |
22 |
--- a/sci-chemistry/pymol/Manifest |
23 |
+++ b/sci-chemistry/pymol/Manifest |
24 |
@@ -1,4 +1,3 @@ |
25 |
DIST pymol-1.8.4.0.png.xz 19528 BLAKE2B f3d23d4cedca3d8bb96b20646a548da4be570697e3346a11b01c5c3599b536ba4697be08472dfa8a4f6533167defc1a37a1de332931a73857319cb28fd42cd2b SHA512 40bb0d3f226476f6e047b5361956aad955232a97641474765eaa5204f0539aee3810e0266213618a45364f9f31f6eb18380b17e0c79f64065f7b62a9016caa7c |
26 |
-DIST pymol-2.2.0.tar.gz 10514753 BLAKE2B 54bf7c639ec1af0c318438f6dcbe5878aded5cc360dee3a5f1dee4b6eea588f4242865ae8adf1e044628ad5f71aa8f6d58d0cc71baf7c1f20eed3045ed3a1cb1 SHA512 56776586276208d42cc4bd4c3cb7d6b9a08e7239186b8f398c75cb57f85e05ebf51aaa8cdec5672e56beeda26f1cd9d14c6de7fba1a741f9c8ec22c1292b9c63 |
27 |
DIST pymol-2.3.0.tar.gz 10448674 BLAKE2B 0d508587d880ce7f2e8a0481bf664e6bfe6eb1d68b0f48b9266cde756824bd8c0144d7243e958bbc5e571d60fca9dafff125d81a8a3d32107e78ad2ff8dffc05 SHA512 e1dcea1c97bcd9045d3543e92902f240e6affbf61a38e8d2a0be04309e3dbabfe1a869847d1423b3151008978d4c305bbf3ce994fc9d453c0063ce020100c133 |
28 |
DIST pymol-v1.8.4.0.tar.bz2 8717344 BLAKE2B a4cfb95eb40a3cd3da5b8cfd4acac7255997f9a3e49ef7e7e1d4c13f36e4aace462a054c326bbaadbc99f22286be878a6d5c518149760b5c939ce9362d4b8cc3 SHA512 73a810adfc31adaf0f3fa25512084882c87b0782c8af716ac0203a5b5b7f0b9fedfbce3d129bffef7b52044e92b0542e683966b2acf961c4dac17fbba72dd7fe |
29 |
|
30 |
diff --git a/sci-chemistry/pymol/pymol-2.2.0.ebuild b/sci-chemistry/pymol/pymol-2.2.0.ebuild |
31 |
deleted file mode 100644 |
32 |
index 1e53d9ab339..00000000000 |
33 |
--- a/sci-chemistry/pymol/pymol-2.2.0.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,114 +0,0 @@ |
36 |
-# Copyright 1999-2018 Gentoo Authors |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=7 |
40 |
- |
41 |
-PYTHON_COMPAT=( python2_7 ) |
42 |
-PYTHON_REQ_USE="tk" |
43 |
- |
44 |
-inherit distutils-r1 eutils xdg-utils flag-o-matic |
45 |
- |
46 |
-DESCRIPTION="A Python-extensible molecular graphics system" |
47 |
-HOMEPAGE="http://www.pymol.org/" |
48 |
-SRC_URI=" |
49 |
- https://dev.gentoo.org/~jlec/distfiles/${PN}-1.8.4.0.png.xz |
50 |
- https://github.com/schrodinger/pymol-open-source/archive/v${PV}.tar.gz -> ${P}.tar.gz |
51 |
- " |
52 |
-# git archive -v --prefix=${P}/ master -o ${P}.tar.xz |
53 |
-RESTRICT="mirror" |
54 |
-LICENSE="PSF-2.2" |
55 |
-SLOT="0" |
56 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" |
57 |
-IUSE="web" |
58 |
- |
59 |
-DEPEND=" |
60 |
- dev-libs/msgpack[cxx] |
61 |
- dev-python/numpy[${PYTHON_USEDEP}] |
62 |
- dev-python/pyopengl[${PYTHON_USEDEP}] |
63 |
- media-libs/freeglut |
64 |
- media-libs/freetype:2 |
65 |
- media-libs/glew:0= |
66 |
- media-libs/glm |
67 |
- media-libs/libpng:0= |
68 |
- media-video/mpeg-tools |
69 |
- sys-libs/zlib |
70 |
- virtual/python-pmw[${PYTHON_USEDEP}] |
71 |
- !sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}] |
72 |
- web? ( !dev-python/webpy[${PYTHON_USEDEP}] )" |
73 |
-RDEPEND="${DEPEND}" |
74 |
- |
75 |
-S="${WORKDIR}"/${PN}-open-source-${PV} |
76 |
- |
77 |
-python_prepare_all() { |
78 |
- sed \ |
79 |
- -e "s:\"/usr:\"${EPREFIX}/usr:g" \ |
80 |
- -e "/ext_comp_args.*+=/s:\[.*\]$:\[\]:g" \ |
81 |
- -e "/import/s:argparse:argparseX:g" \ |
82 |
- -i setup.py || die |
83 |
- |
84 |
- sed \ |
85 |
- -e "s:/opt/local:${EPREFIX}/usr:g" \ |
86 |
- -e '/ext_comp_args/s:\[.*\]:[]:g' \ |
87 |
- -i setup.py || die |
88 |
- sed \ |
89 |
- -e "s:\['msgpackc'\]:\['msgpack'\]:g" \ |
90 |
- -i setup.py || die |
91 |
- |
92 |
- append-cxxflags -std=c++0x |
93 |
- |
94 |
- distutils-r1_python_prepare_all |
95 |
-} |
96 |
- |
97 |
-python_install() { |
98 |
- distutils-r1_python_install \ |
99 |
- --pymol-path="${EPREFIX}/usr/share/pymol" |
100 |
- |
101 |
- sed \ |
102 |
- -e '1d' \ |
103 |
- -e "/APBS_BINARY_LOCATION/s:None:\"${EPREFIX}/usr/bin/apbs\":g" \ |
104 |
- -e "/APBS_PSIZE_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/src/\":g" \ |
105 |
- -e "/APBS_PDB2PQR_LOCATION/s:None:\"$(python_get_sitedir)/pdb2pqr/\":g" \ |
106 |
- -i "${D}/$(python_get_sitedir)"/pmg_tk/startup/apbs_tools.py || die |
107 |
-} |
108 |
- |
109 |
-python_install_all() { |
110 |
- distutils-r1_python_install_all |
111 |
- |
112 |
- sed \ |
113 |
- -e '1i#!/usr/bin/env python' \ |
114 |
- "${D}/$(python_get_sitedir)"/pymol/__init__.py > "${T}"/${PN} || die |
115 |
- |
116 |
- python_foreach_impl python_doscript "${T}"/${PN} |
117 |
- |
118 |
- # These environment variables should not go in the wrapper script, or else |
119 |
- # it will be impossible to use the PyMOL libraries from Python. |
120 |
- cat >> "${T}"/20pymol <<- EOF |
121 |
- PYMOL_PATH="${EPREFIX}/usr/share/pymol" |
122 |
- PYMOL_DATA="${EPREFIX}/usr/share/pymol/data" |
123 |
- PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts" |
124 |
- EOF |
125 |
- |
126 |
- doenvd "${T}"/20pymol |
127 |
- |
128 |
- newicon "${WORKDIR}"/${PN}-1.8.4.0.png ${PN}.png |
129 |
- make_desktop_entry ${PN} PyMol ${PN} \ |
130 |
- "Graphics;Education;Science;Chemistry;" \ |
131 |
- "MimeType=chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;" |
132 |
- |
133 |
- if ! use web; then |
134 |
- rm -rf "${D}/$(python_get_sitedir)/web" || die |
135 |
- fi |
136 |
- |
137 |
- rm -f "${ED}"/usr/share/${PN}/LICENSE || die |
138 |
-} |
139 |
- |
140 |
-pkg_postinst() { |
141 |
- xdg_desktop_database_update |
142 |
- xdg_mimeinfo_database_update |
143 |
- optfeature "Electrostatic calculations" sci-chemistry/apbs sci-chemistry/pdb2pqr |
144 |
-} |
145 |
- |
146 |
-pkg_postrm() { |
147 |
- xdg_desktop_database_update |
148 |
- xdg_mimeinfo_database_update |
149 |
-} |
150 |
|
151 |
diff --git a/sci-chemistry/pymol/pymol-2.3.0.ebuild b/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild |
152 |
similarity index 95% |
153 |
rename from sci-chemistry/pymol/pymol-2.3.0.ebuild |
154 |
rename to sci-chemistry/pymol/pymol-2.3.0-r1.ebuild |
155 |
index 0f197578023..89aef82c8e9 100644 |
156 |
--- a/sci-chemistry/pymol/pymol-2.3.0.ebuild |
157 |
+++ b/sci-chemistry/pymol/pymol-2.3.0-r1.ebuild |
158 |
@@ -4,9 +4,8 @@ |
159 |
EAPI=7 |
160 |
|
161 |
PYTHON_COMPAT=( python2_7 ) |
162 |
-PYTHON_REQ_USE="tk" |
163 |
|
164 |
-inherit distutils-r1 eutils xdg-utils flag-o-matic |
165 |
+inherit distutils-r1 desktop eutils flag-o-matic xdg-utils |
166 |
|
167 |
DESCRIPTION="A Python-extensible molecular graphics system" |
168 |
HOMEPAGE="http://www.pymol.org/" |
169 |
@@ -14,7 +13,6 @@ SRC_URI=" |
170 |
https://dev.gentoo.org/~jlec/distfiles/${PN}-1.8.4.0.png.xz |
171 |
https://github.com/schrodinger/pymol-open-source/archive/v${PV}.tar.gz -> ${P}.tar.gz |
172 |
" |
173 |
-# git archive -v --prefix=${P}/ master -o ${P}.tar.xz |
174 |
RESTRICT="mirror" |
175 |
LICENSE="PSF-2.2" |
176 |
SLOT="0" |
177 |
@@ -26,7 +24,8 @@ DEPEND=" |
178 |
dev-libs/mmtf-cpp |
179 |
dev-python/numpy[${PYTHON_USEDEP}] |
180 |
dev-python/pyopengl[${PYTHON_USEDEP}] |
181 |
- media-libs/freeglut |
182 |
+ dev-python/PyQt5[opengl,${PYTHON_USEDEP}] |
183 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
184 |
media-libs/freetype:2 |
185 |
media-libs/glew:0= |
186 |
media-libs/glm |