sci-chemistry/pymol: Version Bump

Package-Manager: portage-2.2.14/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 166 insertions, 16 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index eadece7d5c3c..dc98cebe003d 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/pymol
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.119 2014/10/17 06:54:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.120 2014/10/20 18:05:38 jlec Exp $
+
+*pymol-1.7.3.2 (20 Oct 2014)
+
+  20 Oct 2014; Justin Lecher <jlec@gentoo.org> +pymol-1.7.3.2.ebuild,
+  +files/pymol-9999-listing.patch, +files/pymol-9999-options.patch:
+  Version Bump
 
 *pymol-1.7.3.1 (17 Oct 2014)
 
diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest
index e37ad10a45d2..1cc6d3882fc4 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -14,6 +14,8 @@ AUX pymol-1.6.0.0-labels.patch 17150 SHA256 b1385696a5f781e51adcd61774362f76c4f8
 AUX pymol-1.6.0.0-stereo.patch 1839 SHA256 accbb7e142d2f4709605d156c169146836d78d29514af5eeffc5c6121d5e056c SHA512 bd32c26dce36b2a44613470f20ef8916111acc20f6525185b9c4b33c25b03efea4ee00f35ab391f8c12874d3bc9e1be665b5706864e660c85b2432b97a9c80b8 WHIRLPOOL 16a30e3830c17420bc53dc86191dbf6b366be94ef5484798e945600b3fc97f83df742d7cdbcbcfa574cb4a4e7c9ff5501f7301d1f33c3a11682f99aadd52dd82
 AUX pymol-1.7.0.4-fix-broken-label-scaling-on-Linux.patch 3073 SHA256 a5bbfc21e3d47e70e597d0b6509251b0720480beb118dff1f85113fc7e59c643 SHA512 96ade2f3d47966fb2322c32d5ab055cc927a065b5ac84bc1de20d798ea6b358a153b6b8c8f85e66f3e3ac04790df416294eb4bbde1b8aad7737c83ecf82158fe WHIRLPOOL bae9e9f38ff0e5bb3fb94d9e4c1d1082d80b40a0ab14e6098733c8a18c5c5289a9dc63725d06299eac917b3f2c6b6b4df68e36ef6fb959f30aa2f2cb283fa79d
 AUX pymol-1.7.3.1-maeffplugin.cpp.patch 407 SHA256 852a4e0c104caf4ea2c297dcc25a522831504b9a185a10c9de03c9a0c727986a SHA512 7c9557f3a1ef69469c2fa2569959130a9a73ad0bbeea4a48ed996dc09de65ae09748b6834b7d3b528aaf393bae6f3706f744ac3feacf67f5cb5f58397c47ed03 WHIRLPOOL 7a24cbc80e3565dd3fa305443940c9ced9a82ea5182152824d4a32b51d3503f5b03ef635ddf8601c0dfb3e551d8b2e6295ad2c7cdd3594553f3da028700c1f5a
+AUX pymol-9999-listing.patch 661 SHA256 4c2c18b667532ba8af87439e46d0597c16ccdb7ad567ce13f59198c769ebcc5d SHA512 759c7756aa5cedf9c339989f96664ae304d0f5dab5354855315c349a2a42c328c3d23d0ac62c0ec9971f9fb38b17ad3d486e4e06be882b22c2ce7a3ac0e635e0 WHIRLPOOL d05273ba454dfc3556d71c64c025e9a4725c25c498aa8298e9d078d11fdc172dceef334a09b6972e51c36fb98ebf5502a2db918105389a47c2dc49f221b391d1
+AUX pymol-9999-options.patch 391 SHA256 503bba64edf33ba60a8143224ffbb0fcdceb4d265fec85293b870a99b5e47037 SHA512 7a06684312f58a4991c515157d6a91428d1fa6391d6fba63fd17911589ade026d6f65c292043f38cfddd878881130cf19ba6c975b25d1fa2152368c90c7d1043 WHIRLPOOL 4bf98460374b64a770d93c72721eccb2750efd6da65042fcf4ef8b949ff40b7041cd6f0b100c29cddcc95f24fb75e32898d1af67f7ca8e9ed9a9e3e583947745
 DIST pymol-1.5.0.3.tar.xz 7412080 SHA256 b304c2839bc944bd2619403474d36cb846b372ba281c8f05931d3f155a0aec7a SHA512 a3f1dd3089fa4158840f2cb8c3848ef70284d1f859429cfab6ac9b00f649d7274a3ac7697a7fb4996d7643068a916f9ad7b1952c5ff27003cedcc7c89e795485 WHIRLPOOL 82788bf6fce52d76ff00d1d7243e8f3962027b4512addaf0fc2f881aaf5f0da6582cb3b3b56a178ed36572947273a999be3d67ba49845eb887da6cf242c5b5f3
 DIST pymol-1.6.0_rc1.tar.xz 6592108 SHA256 7353c9bdfa272b516bd43efaea7df16a6e1632b013ac6091eb5ec34b1f8676bc SHA512 971f03b41db1ed6b1095e91cea49ca5ffb819bf9b97e34dab215112462da02d7bb1b608c462d07556998dfd49631663f3d2cbf27368980f3d69bf134002224a8 WHIRLPOOL 2368fb3a20cbb2d490b1f4b370f770aa7b89921c5827414715ec7616ad66e991bb7f378ed7c379db78b9391dea0bcae9d56362bd705978d667858af8ef46ebb4
 DIST pymol-1.7.0.0.png.xz 5392 SHA256 4c554a5c4f47946b6f7bae00209d5116305162534292735d30ae0794c56a8a0b SHA512 24bb1584b28688f5d5824e938f8500ca9887838adf490b4284c52f8c0da4c5ec4a56051ee80f48e4f34541ab53f9a4e00c849c382f1fd37c232fbea12d700105 WHIRLPOOL 395f978eb9ea3a8f8f39bf0694f71986ac9f8ebb307b90283c53fed85c4412d84e54af472f8646fcbd99c650039cb395a8f02b281168802c73ddb9bad175512b
@@ -25,6 +27,7 @@ DIST pymol-1.7.2.0.tar.xz 6571040 SHA256 3a4ac5b5e865bc539f122636317b69c3ae4b321
 DIST pymol-1.7.2.1.tar.xz 6570132 SHA256 b8538b3c4de20a630c6282a3b0a0204bf259dbbf952a3246366ffee8cee57b8c SHA512 db176351a624fb270e5aa8b5fc2d96ec93098ce0fa5c424df7eb24b58320766dc3c4563e4848adc0d723350a881689b19a92f5f8f471d763dc339eadfc22ee32 WHIRLPOOL c98a4414579e54358687134e1284b12c42b405b68366d8406d329788bbeed936bd906091f47c4fb234905cdf1b6a0deeac577dd7639a4e982217e0ca90c19e8e
 DIST pymol-1.7.3.0.tar.xz 6505060 SHA256 0a4f89a5cfd19859804794842bc0eb51554d86fb75ee650007e87f0af8b45464 SHA512 03f53c77321fe2837b43f9cb2e5962f04f5cb430c63f49a2a84e6fe010371ffae1c3542d3546b9f2eff07f9aa7b4fdee6c70124096f4071017a77cf48bf60e5c WHIRLPOOL 7a39d9cb89197c141ab8d4808e9d7c3f43a3de5147a75b3a15cb1a4d3cfa2027e59571108b79563150df81c75608cbd92d82d319c455f203c4af76413477a524
 DIST pymol-1.7.3.1.tar.xz 6516580 SHA256 688a4fc07bb88e80bd757ef9c6f9fadd3b2e09ef76cf4032e1119acb06d14d7e SHA512 2cc710ab772189e6eba38a3e44552f43fc53c3014379536139702bd24923ae85630ad2658ac4e4690820145f4cef4146d28025701d98e4c1540cc523c2553fd1 WHIRLPOOL f2d38ec9497d5a10982c00f07176acbeca0513057ff592dcd68ea27663d4dab386f423fad9686a624b420e11e7861f1d5db3a8ab8b5f978e6044d616c2d81392
+DIST pymol-1.7.3.2.tar.xz 6526988 SHA256 ed29e9d10d66015ca4211b0c1bbb0755dd73a5d6d9382f560708adb5f66d732a SHA512 9c7da95a0ba39cdccf66118c4792fea8b9bd016c50e6d5b07e7d7a25eb2fefca7514404f53ddb89af4622edeef17167d4a7c5955ee75b7a936b728fa8e92de6d WHIRLPOOL d51779b66c216b34a440e2d234b6824644c206f1144a9b20a7baec1b74b4dd30dbd42168aa453cd2b86d0d8ce46244a722849e9dc686b102fcf15f02ac5ed5d5
 DIST pymol-icons.tar.xz 38100 SHA256 03500f28256f67abfbb7d08b798b11aaa208f0ae1473ef2a7205b3c012ddb06a SHA512 5af51014d4fcbc85ef1fecd7667224709c9305b9b72bfdfd89ece2b4420fa8a81bf8c85fcc5903e2a670f44403f12764808f6a16ef42f111bbd0e7ed8e412d54 WHIRLPOOL 6104d378928c56b39f8cbe29184629b73f87da09e81e41ddc08b9b291876f1a30ccaf9ec257f47798c6d03253816f80c14567073c419fa48dd1520fa3fa58ecd
 DIST pymol-v1.6.0.0.tar.bz2 8695114 SHA256 a37eb1a1bd882da14ac9c03617f62f6a49eea5a6dacd0d7202fb3b7cba84e62b SHA512 afe4a9e9c9501b3e636ca97eac3e4204da2cbafd7dc85ad6fd43227c68b448de435f190eea9c75b3403f11786bc512b6366bdf092c591432440032ddc018b0b2 WHIRLPOOL 30302badde84ad63e4a402a54046da63812051879bdb707782589b4bfaa09a8f590e58b5bdd89d0deefd9d2127f17406dd862f36f6a0e33e3e410f8a9d47a937
 DIST pymol-v1.7.0.0.tar.bz2 8775358 SHA256 f4c1b6f0dfc9b1b8419d92e39d436d4ea3462bdfcd17df1025877379bf647a4d SHA512 f5a1dc255aefe14f1cbb716687af959a53757bb77d9858650ea8b021f34bf9f2a48ac04fbfe40f67fe0219def5cfea1e30d78f50fd68930c5bbd4983ea58d8ac WHIRLPOOL c0a4b7f93a4140af44d5b3aa0824426482e65f5dc7c6a598435388ac3dc912ad220dc38a619165b921cedb131069d02a41bbcda8ce218dc3f8c052a3dc7a022f
@@ -44,24 +47,25 @@ EBUILD pymol-1.7.2.0.ebuild 2590 SHA256 e2f0fda771211143ea680aaeb70c30b61ef1af4b
 EBUILD pymol-1.7.2.1.ebuild 2590 SHA256 24ced99d2801103f09868ef9df1c65b7e28a840ea01f00fe353ad99f28123f80 SHA512 0950f1386f87e95d485f804fdeba72b6d34c62f922501ee3252610d227aad873d6b8abd0d0cab5cb7464c70bcd326dff1d3a37285142541cfcaf07c4126abe97 WHIRLPOOL 159092231777d7c17dc64c050e8ffa85be704d56f44a7322d86733499488ae62afd839cc06e914fc95b3d15ba8683af0d2632051b9fb621c486ab5da3186f47f
 EBUILD pymol-1.7.3.0.ebuild 2590 SHA256 41a7158fd607a267f3f670e96482a5428b8da4160b3e45fe30e21d75ad2583e5 SHA512 568e0f1384e6d6406f1e5ca7bf3b4eaac8e61d03151fcd055a2b56201b4e6601ee59df4f640858379b26362e1ec2dea9bdbcdddea8af288898d7b9c26d0028d7 WHIRLPOOL bc14a06ee2280f5189366ff7988133f41b0336b835fc281e294de4cbe16f07a4e9beb161fdc8def2f125f5a3e20a669ddd9768d5a85b97db41942ad1689d9377
 EBUILD pymol-1.7.3.1.ebuild 2773 SHA256 d53a6204866d76c3a6eed1cf17243463fe77c31bf910d252faf58d0d2c104b90 SHA512 ec233aea7f21645ce08be3ee85eaa3bd9e0da03c5c83bdfc45df7192eb855225f599aa874436d737f354dfade4fcc6feabf52281f7d16a7321c4950b27c2bc25 WHIRLPOOL f4b5aab663650f6a009dad439972f83320e80c1f9199c4a5c094bcddbce6a9ba408808479a0f02d700b46e294a2c52768cf561a30e34c7616b54a6b477dd14c6
-MISC ChangeLog 7263 SHA256 a50ae8886bcf40ca9d6088b7015fd4a299c2e38909ef6e5eb3e5286ea3bc0cf1 SHA512 e82a15d332119c0e199571dcb4368bc7a1a185f6d3cf8623429136dd50037a0cbb0a913b28dd81359c7494773b624ee0fa05dc98bb7c4e4d8ebda300745bff2e WHIRLPOOL 17ead09b3450269919f1da805a6147f0b0c895406d15340d4cb0c327c975ad78b98ec73f7cbed6a1c17e7a6458c56ae0d913b7d3db5bc6c7dc56e1bd80277c63
+EBUILD pymol-1.7.3.2.ebuild 2862 SHA256 5d87a5ec990de9ee7ac63d5038b8630c47c5b3a7dfb18acf4effab5e3c2c3bca SHA512 07f3fff93e7840c441ed3d35900a193c67f0aa51f5602c8ea1b24469702dd99fcdc59e15a8f5600003e1724674d813fb91a941ac092f25172f2c1009ee710fa6 WHIRLPOOL 441e2fa2c9ec2f8e8b4ea461457ccf3a2de511f91b3db8ce740b04ef6e8bdf2d8b39f835912eeb74483ffee2b2fb1ec725de032d0e782a1c83480697d3495216
+MISC ChangeLog 7447 SHA256 31d811dce4430024837a27f2c6242221e2a2b51f880e42438be456200d590dba SHA512 b3dd9edf50723d564277edc663bf4ee0c76f7afce7214e2a0f31ef93f390dcfcb1f784e28763fd4bb7efd40f242d1e226568941c0cfe84f4876e8a3df5f7e4ee WHIRLPOOL f224913f9ea099f12c58268beb1ff4ec0839f14bbc6af606562ea6c8c0efea48383c0f88a9f57157e653e32f1d61fef60dbddb14a5c41890abf83f37900ed96e
 MISC metadata.xml 491 SHA256 7370aee92bf4088e8dc054dc8812cc30e98be7995570afae89dfacc49eec711b SHA512 319f8924b56ecb64e35892fa10ab94adbca68dc3d9dffc760d54e44fe19feb0e3bf87110aa7e94f25a353792e84610353f2f8684b6032426cd4eaa70fa5a9fdc WHIRLPOOL 93baebbb622f81fd48b7396bb3f98c8ce0d97db41c6a09e28da0cd923261961100cd715ada8f4ff70f79638cca88b0f1ab0b0ff78f9656323efcb871ea0958cf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUQL0MXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJURU7zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirwHcQAJ58RaPd4d7y+6dZElkeq/aM
-gOCl6hBF3BY3DuumwCIXdNz+YmHchiDdU47h6ZIntdU6RHEadascqJn1k0cNausM
-vsxgmB6t0v2eVTYp5/VhTqVTM8/ENetyjy4qOL+R5gtWDcAYqjgI45H4eJVI/OLc
-bD+z+xA3yglOyiOCmgSIszPo91lOMdm7iyuTQbdfcQlzGhCIzIoGC7fEs8LFJpyf
-CJ0GBL/qmZaiKVxWkeHz64XPSzj/bHXxc3+Wt3VvDbUWfXLRxmAKo/Qw0kwCNMCe
-RWcamNMc5rdfKqpUr31h7c1qxwH5qVpBEmX9XXEkQClaQlW7D3/XUCUp8MxOId2z
-HMRdEiZ0TImJ1Yi8kFcnMqZ6auESHKYLv1x7pFXtvOnt82AnlloCw9noQ7JkTnho
-ZlNaQcDVUW9XGLMlazIE9kujsvlQp2rIO2Jhgi8ZbP2Ko5yHXdOsU3PAeB+GIxro
-2n+su4gPwvCR8gNRbzeQDVZxA6tuPelIqh5TLRYTfMHbkho2b7ZRRK09LRHOwjwQ
-S5jgS0d1w2uNsfHDa4oJ6Y+YX8lEJN/NeAuTG5A5PiOpPanLofs7J2035O2dUQk+
-iWcgAaowAQEXJDeclDGPMEZeh28gpE+l/MuPFPTvVLwuXsPIES0K1D2pVfF2Dvam
-uwUMK+EJXfLN2MH/3Zky
-=tQjN
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir/KQP/i46E79Qor761e9zxdhtkD6D
+Zbkw2JrcdVmvApAJxaW64LDPPQk/1qCEGBNkKToTHqhIPaDOIQcKMOoCRkgcTziJ
+2HKeIPGHiBitOskxKAHYXv9Cvb4dQ6eihO77ABHBy0yP6znQzEN0PYkJOhi71BdQ
+OqOlIkmane81AXNQRy1cnNfwgR/FFkonvkFfAH9sYA/WFBIYv7QXNfR+OS62Vqo8
+aBNy55HJbJ39nQ/sgIphBQMjgGstTB1jlsXJ1/wkGysL0L/w4Z7wlq1u6pC7lB57
+HA9hKAAYSRotzQlEueCYV/Dj3Se8sFLVti9AmtplwSSbihpHyD0Zm7QR3oiXr7M2
+w7Fdp6DoLS1eIGuEljIq5EbJ6lr0O2OOavlnDVCuq7iK4UU88jD1/yy8XQwwxQg5
++wBItTC3ETYNBxxwb2XorS+TBfZL1F5IhfiVFYkBNH+mJLlnr0TLxOyTiKC7TrAZ
+HgGOD0sypXYjdXoKo66BINzNGU5/4cU96Trt7bdKutwRWGEP0F52Mn3Xon2iS6mZ
+Y3DdsUNUSZ6WRnPCT/A0fyyK+s7AMJ8MddfuAE17SOadXadfd4a/OR6yVr0TJmKj
+Qxl1cq2zHWeCliDbIRuNI1Kr8VjEzY5fydykYgPxg1Iq59EVRbzoFkhQCVvmQe58
+sgCxerEwN0HDFcmppEEP
+=+OJu
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pymol/files/pymol-9999-listing.patch b/sci-chemistry/pymol/files/pymol-9999-listing.patch
new file mode 100644
index 000000000000..1b4039c560a6
--- /dev/null
+++ b/sci-chemistry/pymol/files/pymol-9999-listing.patch
@@ -0,0 +1,17 @@
+ pymol/modules/pymol/plugins/repository.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pymol/modules/pymol/plugins/repository.py b/pymol/modules/pymol/plugins/repository.py
+index 9697f68..9820fac 100644
+--- a/pymol/modules/pymol/plugins/repository.py
++++ b/pymol/modules/pymol/plugins/repository.py
+@@ -182,7 +182,8 @@ class GithubRepository(HttpRepository):
+ 
+     def fetchjson(self, url):
+         handle = urlopen('https://api.github.com' + url)
+-        return eval(handle.read())
++        ret = handle.read().replace("false", "False")
++        return eval(ret)
+ 
+ class LocalRepository(Repository):
+     def __init__(self, url):
diff --git a/sci-chemistry/pymol/files/pymol-9999-options.patch b/sci-chemistry/pymol/files/pymol-9999-options.patch
new file mode 100644
index 000000000000..ce05e172e6bb
--- /dev/null
+++ b/sci-chemistry/pymol/files/pymol-9999-options.patch
@@ -0,0 +1,15 @@
+ pymol/setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/pymol/setup.py b/pymol/setup.py
+index c446d6c..b7b353b 100644
+--- a/pymol/setup.py
++++ b/pymol/setup.py
+@@ -51,6 +51,7 @@ def CCompiler_compile(self, sources, output_dir=None, macros=None,
+ class options:
+     osx_frameworks = False
+     jobs = int(os.getenv('JOBS', 0))
++    no_libxml = False
+ 
+ try:
+     import argparse
diff --git a/sci-chemistry/pymol/pymol-1.7.3.2.ebuild b/sci-chemistry/pymol/pymol-1.7.3.2.ebuild
new file mode 100644
index 000000000000..8a7bfbccfbdd
--- /dev/null
+++ b/sci-chemistry/pymol/pymol-1.7.3.2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.7.3.2.ebuild,v 1.1 2014/10/20 18:05:38 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk"
+
+inherit distutils-r1 fdo-mime versionator
+
+DESCRIPTION="A Python-extensible molecular graphics system"
+HOMEPAGE="http://www.pymol.org/"
+SRC_URI="
+	http://dev.gentoo.org/~jlec/distfiles/${PN}-1.7.0.0.png.xz
+	http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz
+"
+#	mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-2)/${PN}-v${PV}.tar.bz2
+# git archive -v --prefix=${P}/ master -o ${P}.tar.xz
+
+LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="apbs web"
+
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pmw[${PYTHON_USEDEP}]
+	dev-python/pyopengl[${PYTHON_USEDEP}]
+	media-libs/freetype:2
+	media-libs/glew
+	media-libs/libpng
+	media-video/mpeg-tools
+	sys-libs/zlib
+	media-libs/freeglut
+	apbs? (
+		sci-chemistry/apbs
+		sci-chemistry/pdb2pqr
+		sci-chemistry/pymol-apbs-plugin[${PYTHON_USEDEP}]
+	)
+	web? ( !dev-python/webpy[${PYTHON_USEDEP}] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${P}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.3.1-maeffplugin.cpp.patch
+	"${FILESDIR}"/${PN}-9999-options.patch
+	"${FILESDIR}"/${PN}-9999-listing.patch
+	)
+
+python_prepare_all() {
+	sed \
+		-e "s:\"/usr:\"${EPREFIX}/usr:g" \
+		-e "/ext_comp_args.*+=/s:\[.*\]$:\[\]:g" \
+		-e "/import/s:argparse:argparseX:g" \
+		-i setup.py || die
+
+	rm ./modules/pmg_tk/startup/apbs_tools.py || die
+
+	sed \
+		-e "s:/opt/local:${EPREFIX}/usr:g" \
+		-e '/ext_comp_args/s:\[.*\]:[]:g' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install --pymol-path="${EPREFIX}/usr/share/pymol"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	python_export python2_7 EPYTHON
+
+	# These environment variables should not go in the wrapper script, or else
+	# it will be impossible to use the PyMOL libraries from Python.
+	cat >> "${T}"/20pymol <<- EOF
+		PYMOL_PATH="$(python_get_sitedir)/${PN}"
+		PYMOL_DATA="${EPREFIX}/usr/share/pymol/data"
+		PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts"
+	EOF
+
+	doenvd "${T}"/20pymol
+
+	newicon "${WORKDIR}"/${PN}-1.7.0.0.png ${PN}.png
+	make_desktop_entry ${PN} PyMol ${PN} \
+		"Graphics;Education;Science;Chemistry;" \
+		"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;"
+
+	if ! use web; then
+		rm -rf "${D}/$(python_get_sitedir)/web" || die
+	fi
+
+	rm -f "${ED}"/usr/share/${PN}/LICENSE || die
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}