diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2015-01-22 09:06:50 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2015-01-22 09:06:50 +0000 |
| commit | 0376679dc0e5eb2b92c790d1345a3a1728462391 (patch) | |
| tree | 576d97d2c84ce529b413ffa264976f70c08ee4ba /sci-chemistry/pymol | |
| parent | sci-chemistry/apbs: Drop old (diff) | |
| download | historical-0376679dc0e5eb2b92c790d1345a3a1728462391.tar.gz historical-0376679dc0e5eb2b92c790d1345a3a1728462391.tar.bz2 historical-0376679dc0e5eb2b92c790d1345a3a1728462391.zip | |
sci-chemistry/pymol: Drop old
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!
Diffstat (limited to 'sci-chemistry/pymol')
34 files changed, 37 insertions, 2961 deletions
diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog index 759cabd6e6b1..41ba243c0ccc 100644 --- a/sci-chemistry/pymol/ChangeLog +++ b/sci-chemistry/pymol/ChangeLog @@ -1,6 +1,23 @@ # ChangeLog for sci-chemistry/pymol # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.125 2015/01/22 08:14:25 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.126 2015/01/22 09:06:49 jlec Exp $ + + 22 Jan 2015; Justin Lecher <jlec@gentoo.org> -pymol-1.5.0.3-r1.ebuild, + -pymol-1.5.0.3-r2.ebuild, -pymol-1.6.0_rc1.ebuild, -pymol-1.6.0.0.ebuild, + -pymol-1.6.0.0-r1.ebuild, -pymol-1.6.0.0-r2.ebuild, -pymol-1.7.0.0.ebuild, + -pymol-1.7.0.4.ebuild, -pymol-1.7.0.4-r1.ebuild, -pymol-1.7.1.1.ebuild, + -pymol-1.7.1.3.ebuild, -pymol-1.7.2.0.ebuild, -pymol-1.7.2.1.ebuild, + -pymol-1.7.3.0.ebuild, -pymol-1.7.3.1.ebuild, -pymol-1.7.3.2.ebuild, + -pymol-1.7.3.4.ebuild, -files/pymol-1.5.0.1-data-path.patch, + -files/pymol-1.5.0.1-flags.patch, -files/pymol-1.5.0.1-setup.py.patch, + -files/pymol-1.5.0.1-vmd.patch, -files/pymol-1.5.0.1-web.patch, + -files/pymol-1.5.0.3-prefix.patch, -files/pymol-1.5.0.3-web.patch, + -files/pymol-1.6.0.0-bg_rgb.patch, -files/pymol-1.6.0.0-labels.patch, + -files/pymol-1.6.0.0-stereo.patch, + -files/pymol-1.7.0.4-fix-broken-label-scaling-on-Linux.patch, + -files/pymol-9999-listing.patch, -files/1.2.1/nosplash-gentoo.patch, + -files/pymol-9999-options.patch, metadata.xml: + Drop old 22 Jan 2015; Sergey Popov <pinkbyte@gentoo.org> pymol-1.5.0.3-r1.ebuild: Drop to ~ppc, wrt bug #507142 diff --git a/sci-chemistry/pymol/Manifest b/sci-chemistry/pymol/Manifest index 044bb22f152e..4832ca8afce1 100644 --- a/sci-chemistry/pymol/Manifest +++ b/sci-chemistry/pymol/Manifest @@ -1,67 +1,30 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 -AUX 1.2.1/nosplash-gentoo.patch 485 SHA256 acf8ef1d53719c1b4158b0f49250e8ed7c3aa4c870ef7ce4bdbc8ec97f591e27 SHA512 a47022fb97e176ca9f6abbab9a738cf3d59a6d7257d867ffdc7091fb726e24089e7e1523a902524e1f77eab7453c0ca2163716c365f1f8c3b5d58a0820d07828 WHIRLPOOL c80681a27ab1d99404e9d7ce94fe07a639e3c971a75177bd0c3232a45540e69d08f614c5ca72dbadfa4a066029581936f06cc8919ab375c1ddf3b66fd56f05de -AUX pymol-1.5.0.1-data-path.patch 6765 SHA256 ad3ba9a519cc2a97c37868ce4d27a9868710be0dd32687327abd920c57db8661 SHA512 df17c40757012cffa4e63a740b9548b4b07bd81a691896c174850713fce8ec4a80bd6a035a03343c04e433ae9d09706c2d3e2b13d16d0fc6049708100025951d WHIRLPOOL b9f46b71f1c803b1c00976672a94984b786bc2b2d94c6dc10769c09113ece255bf14c0540cd106fa3c835b77cb51a34759507a3ec4674d5d307d467696a56565 -AUX pymol-1.5.0.1-flags.patch 521 SHA256 7a92d5ea975dcef50ea9614b87c56d7b4f1b976210608800413a80de98c69a3f SHA512 70b2b4c210e7e32c0ed039ab38fba6acd1f3bb0c7f67c68c7040ff9017b853e46bdf40de92b67c9cb4754cbc0ef43df8abaec25e3fae606d40aa43a9f5f22e44 WHIRLPOOL a9f0503bbdd97b10c2c458f7f07d4be26cc4e50d48110adc7b77bc2a5dc85323de757b17ad14795363140a52201ca999389d927350b9b0418699fb156fcfabe6 -AUX pymol-1.5.0.1-setup.py.patch 893 SHA256 3a03cb19878a772caff5c6931ff7bb1fdcd022147ec0e8a23593d4ae61cf1593 SHA512 9a4d985c981a727bb8ff7b5fc8b088dd9b774bf0f6addfe3d3517850629f103dcdd3e4ba03016bcbd127f10d93c9b844b78e826d090c7a601d535801fb74ab2e WHIRLPOOL 5bcfe9b4c095c8636d34c841764d421c980d9ff2a78f09e06049d99287d4b7c019ead5b9f0d5f9b830424c020db33fc1240d01203dc090a04ec69c3587d2b33f -AUX pymol-1.5.0.1-vmd.patch 1723 SHA256 9a31ff39838484ce0df7658b896b8da137740871901bdc66db5dc4c46c293e50 SHA512 18e4d9d87e668be8309e6c28e2345041373ac6b26441d3dc329494f2809603fdebd6b43613609618aa5a0e61cb6cd49dcb003e2642375726a9b1cb057f87850c WHIRLPOOL a7b5e0c4e1fbe092eeaa546fab865f038dc403ce4830f09f126d99999b2c9b739fed893766651fe50b56a7cd7d7344d99d4032ceea0f9507927bf10c482613b8 -AUX pymol-1.5.0.1-web.patch 634 SHA256 7c30f0c030c3f2e30cbd1f37c58910592a71ee2d5c5a351130e0bde13104c49e SHA512 98da13dcf6d652a55edfa702ecd2e304b525833cf13380f87185a8710aeac5529a9284f83146e5fd80d2ca3b15c174ddc666a931f2a643ca4c80333f00fb9d3a WHIRLPOOL 8ff57da3a02d5d6fea9fab91fe11bc18c361e563145853166a2793285fd87490859089a1a3c46488b5703f801f805bc3b3720ae6f9bbabfd0bc33d89804c00d2 -AUX pymol-1.5.0.3-prefix.patch 2278 SHA256 d4bb54dd667011747cf4f201cc4c0ac84ed6eb59cb066c374d6f89097a3914cc SHA512 bce01e7eb890863f43be482e7eeae8100002c5e27ea935dfd36f3867b80f734a41d7f723e33e39574bb6ff0547d16febf637d44fd0371c68897d6b6f61d6ecec WHIRLPOOL 4a74ea99bf6620e1c37b6a3c1382de6d1f5b97ca97d7fbeddb3207172dfbbda1bd3bf90ea6072627e5595014c7760c2d15378b67a67f3ecc0cefc9fff84e9eac -AUX pymol-1.5.0.3-web.patch 545 SHA256 559fbf42497c33a0ec844a11d7cd89178a8e0bae437df71a4408b891857ef9b3 SHA512 272a516e8d2780bd5b74e852c9d06c27f8dd645e3c68b17bba1931d0d59af55637bc0565447642539b3b0e73b82e5392c13e51171aa3a2ebf42d717fabf4bce2 WHIRLPOOL 95a5bf25a068da437dd2c04fb22b9b4216646f9b0bd0c3ce333428a5eccc090005a0e6b4fd50279ba22df9a754acb9b61fdec07dfb7a134e3d966e0e8e14cb88 -AUX pymol-1.6.0.0-bg_rgb.patch 9264 SHA256 12fa3a5a83f77ecbff3f5958e40b7c8f0b5f9c9bb7fa2c1e87cff15f2476e83b SHA512 23627c8db8f55bfe8150a7bd4f75033d3f09f308e0f7c39f79e67c6c749fede2402f611df102e30d74cf8c83b27c0143833c7bfbcc54bd04cbae1adefefc0726 WHIRLPOOL dfa0a9918815c9d048a89ed3b8f40409532192f2bdfdb64a1c1495b5aa0641bf4c40889387ba752de5381999809812ab2933a155e5054efa3997a4a7cbad49f9 -AUX pymol-1.6.0.0-labels.patch 17150 SHA256 b1385696a5f781e51adcd61774362f76c4f8443e168e5232b1b577f06a6821b0 SHA512 190353d690656685da0e7912cb74426c161659a177d3cc8b1e9bdeb02513756b9d36b32c0ee351905b5dd31e7a7ea6dfe7ca685533b0ef7651bd51190e2060bc WHIRLPOOL e79fd2debc7b3bb80f0d83fe49c9b90de24d5e3f0e373e2b91452965059874c2d007b3e2731028a2ab4005ddef3c75404ee7f4b6bde6216e930eb5ff2fd1fbf3 -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 DIST pymol-1.7.0.1.tar.xz 6550492 SHA256 e8c6f6a465aec78171daf5cd981ebd1614dfa5e014e13c85a044cfbb591841c8 SHA512 a09277cd827f832c4f4e307f6117613d2ee8250643d129a5c34a30ceab2bfe8cea195c71a138fff09b6c69e9427153b917d7d3a7262d154ada5f323ec9635087 WHIRLPOOL 1803b55ade1b04de5963fd4a3bbe1354cda8759e15254c644952e25d7dcc904bc7b9fd91da75fdb8c6a96fd118a5a21bec9c8bba368744b44436747faca5cd9c -DIST pymol-1.7.0.4.tar.xz 6565436 SHA256 29ff657ae45c733931473a49f88add8bb760e31ddcf03738bba82fdbb3b875ff SHA512 1033e3d8da59c71849f7e7fad89f090fd5015469ba7ff00460b07d73c4a6640fa7edccc748b68ccf1f26e1d94bc8d26c6004f8c2a0481403f79a77e7028a6d6c WHIRLPOOL 2c978cb47944e148b6bc4bea3b96168de624c279bc4ae59c437b7f14a3448ca600dbda77f3ef3f3533a487b8c52b3478314b60044f99dd5229f6576d6e46a438 -DIST pymol-1.7.1.1.tar.xz 6569352 SHA256 aef62da6e68c218972d59920b1a243adfa2b780313cb55768dbce00abb9ba881 SHA512 7239cc7d8fcd8236842419e42e296ca263f31a30d3a70288b5357f1cae53221c21d6a7399fe335b13e555197846ec17e2b507886add3cf82de1d66bd19a00bdc WHIRLPOOL 7ba972125cc770d300b1df7cde5c9f85bd6dcea8a4867fceac110f020ce251cae5082b7c61928627909b5d7596101eb964d0bdd40c58ecfc2efce4e04f6c139d -DIST pymol-1.7.1.3.tar.xz 6566460 SHA256 837b5df679887a2b7bd749972da2200f61508da28dcd8dfd726c80856ad942db SHA512 fdd20fdee7036345cfbcbafa0a5663b4233163a73aa1135c58dec145e9326104fe895904bb5c874cb81140215efcf91c1de1249d0c5731f0ed7d4da4ca7a49bd WHIRLPOOL 1dd62ff187cc086be98a9eef4bb0cdfd26e5572a2ca24776c7c5b172ee3ef3d9ceb55f50c4b3d88b4eefe5cd15acf4b768d0adbabf2cf6c5e8a558689bddc5f3 -DIST pymol-1.7.2.0.tar.xz 6571040 SHA256 3a4ac5b5e865bc539f122636317b69c3ae4b321b8dcf658bfc24b95f74c3c772 SHA512 a140dfdb8d84d4e4a02be2b173e70447d11e2855caa4bcecf156f069973a9fc4e589e37b39470267191ef1e772bb63f0ae2c74632e3a3742d5ca744e86dc8dc5 WHIRLPOOL 204e3dc9d8e0e2f9c0c932276e9f2dbe00750eac4af6d6e09d94f2ad1dceb31fd702582af259f86f1134e734c69fd268b08cbba12ec87e016266f1f295f31552 -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-1.7.3.4.tar.xz 6526772 SHA256 68b89e07c6b04c1493b7af784a60bd74f71cd1decc260873d8221d9482552930 SHA512 8fd7aca344b1ffe90e0e434b2c11215cbcf1873c410e82eb44d386cb59296e1a6714ef58eb10fd450689f5fb1f6171aa1502a9b74935d8be8a1c54ba43c05c1e WHIRLPOOL 2e01a1a433d1acc4e152a7ef6e6d2b8ef2bcc7c9b7b1747976c17bfef15bcd73e8716401f43f0ba6b75a11af193d8b72de2756f60a677d9e054ffb5370b0cf95 DIST pymol-1.7.4.0.tar.xz 6528964 SHA256 5a732aeb8a02797a185f54c3bd8bb477a1a11976eb9f982f6cf79ce887ce3a4a SHA512 fa53e90413cb1e02797a30b21b4254901504edc029104567fd2d4c5ef630eb8c2eb9f5065b2b9e65f657aaa30ca8ac85c3314c6c7fbb89148d89a9a0964de3cf WHIRLPOOL 1467a9746abe60e371162e6065253fbb23453f80a4757a18936f5b6509f63657b7073ee5e118c7e4faf333371cd38c78917e1f4b0a3a684b4807972546180d69 -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 -EBUILD pymol-1.5.0.3-r1.ebuild 3111 SHA256 a033cabfe2368eb4d813a6af87f47f0873d4b3bf83b8e57224190fd06e010acc SHA512 95f1624c4f7ef518ba4edaaff8db841da05b9c7ee15d7a504a8be39dac4a75e7275e3b3284e68a2f7e92838939cedaee7952c3ffc9754a6848c406761dcf31e9 WHIRLPOOL 24982a379d5c0a68383e86b19b9a24dcc428b3866fde625374f86be3ad7a7811e9ed77ca1d80e482c3642d23d6e2565f0e33e6f2dde969eefe85bdb28a62d686 -EBUILD pymol-1.5.0.3-r2.ebuild 3023 SHA256 b10327f0279c3ef691ce2424511b8c0a8526492094451a313fee91c8a7eff8b1 SHA512 26d4808bcc4a56ca8ba4b491ce9394d687acdcb38b1d451c8d0342337c3d8b64b2398446642a157836ba228d767ea34d34f80f1d6c32cfd979dcfcf01bf0cfbf WHIRLPOOL 6f99e1b40170d4c72fe4fbf5a9d4fe7cf86b65983247dbd799961592d5a023ca699d468a7eaa60fbf6647e8251ea744587ad7b2fc4c61e9692f4656a65e7a719 -EBUILD pymol-1.6.0.0-r1.ebuild 2394 SHA256 ef28ed9df61b28116265279425b5d25b233bec2a0f93954de93734fa30c9e2d1 SHA512 014cdec14a2f42996cb932b2eb12112375bb7f42b2dcfdb0c3d5b3336baa760eaeb20354f52653dc82921314ea899bfad972b569537e6f767503285587a6736d WHIRLPOOL 15a833c9e147ff6d25c5dc03ca076ae35cbea0d1ca82f648a228ff41812941f2e21d4d0ae9c00581715fc320d8ad9723ae399620e057d7e691c5a782bb95b2bf -EBUILD pymol-1.6.0.0-r2.ebuild 2427 SHA256 1df2cf9c1af345fa1d83456441a4c7ac6a7c71b5ada6057065700dce4e9e0d48 SHA512 5902458e124d863f9d05483be444cc4d9b872e53bd82ba6b044f03dbbc8e9e39a58b9efc08591dd48a6181a12f39741820e04a9d07a8f24fe321ee771dfc0c6e WHIRLPOOL 1da4e8147f7440e974f46d2748a0a60ed595f144daf9bae10dea13c86c709c01d80b6fe478fdf7fd9997500caf1fb7356d744ed27c8cb19eb8e8d72995acb095 -EBUILD pymol-1.6.0.0.ebuild 2312 SHA256 ccd24786e9c58c3dc4e33e773967c9a9e9bd1ae8fd3912c0d6f99bb65bacfcfa SHA512 18ecdbe8861345cb84962c745df46e450ddc089641252a7bb2c1e2c8096bd5214ae05be8efb255ffbe229bf41b89adfc47ef080bd05da60b323e08eedfcf6cff WHIRLPOOL 020f95b43bdd8d1ee428bf3b160d20aeb96582993a8c0c6687626d3ba830c05649c0539528bb82db97214638ea3dc40b04d68fa0fd26620cc450295c9c41c44e -EBUILD pymol-1.6.0_rc1.ebuild 2245 SHA256 6a6e981d58e5b8d35d0fad4d8604508b63c9235f1a674af3e1af2f57bc2e3557 SHA512 4ee1de749837a1deac09face138f7c133beecfb56988e3974015360ed6d2d52a593c9f4c895b34ae59cd87c9284f19475dfe43f5bc04a7149bcf5a07d29f9e78 WHIRLPOOL db9e105456f477b9e20a2b0d0e33c032ea380f8cf8dafca53be2079defc34860e28edd0a4a5918e0c4dac51d3b8364d80e62b4dba2292ea444bd9ec78966e2b4 -EBUILD pymol-1.7.0.0.ebuild 2460 SHA256 30007dc76bf05a9d5828ddec050de88e960c5551d2a91c356f1469cce4947d94 SHA512 034f80142e4151bb43e40b4b3b4ee366d9f6966d1e378ba43d59f369294ae6e7f7a232102705e06e839b85ece58e583969aa5b7b620391bd76aae6044ae7cf43 WHIRLPOOL 6e5a9a93d3c4534d2179eaa76df69b5919d0d72fc72ccc16d9005eb854a12a7309b5196bc818e33e554710739f9905b5b7d5ac01cbaec7d95350e175932b0b22 EBUILD pymol-1.7.0.1.ebuild 2539 SHA256 c75763c903f83703bd358286ae94b182b260c293f18d809825f1ba91556ee282 SHA512 dfc08e66f061a4e7b873eb16460673ed8bbb2d4130f767270f1fd40f234f06d4eb14f717df514a63ab16d6ef6184eb56f309dc6a8c8ad2afbdb32cbbb13b2a35 WHIRLPOOL c0390d4e79b7239d96925825d299c674bb3e16fe87cf3f456ecf6f145edbac5bab2c1c5c0915aed7b85ff0f674f3a171110130e0f78f8c6385a3c307dcf63dd2 -EBUILD pymol-1.7.0.4-r1.ebuild 2612 SHA256 2fcaefdacb85758acd9a5af03d02e5e11bb4d5e28b33f4b688144ef968bcfb11 SHA512 715f7a4aa22832e2504bdcd0882f3ead4f69d77c507a90acdfabf2cae970818c3319bc622969e8970a629820a2fff64e336f6ce62af483837777a7f603778aba WHIRLPOOL d9c0fb559906eacbe3aed4a799b70be4a10e9793f87c923c0ea6262dbd9ad8690c5c0a6c80a364ebc34c59540172e34627564ac63d50c07c80d2584aa48c424a -EBUILD pymol-1.7.0.4.ebuild 2536 SHA256 51b340b2ecb35dd8e699dfacf40b50d7fbf77c392dfb85de414b4dce1c8c4408 SHA512 2e6a1ba9b3ccdb91ea49da47b98bd5ed2575d1c4e53d95eefebaa05d2183c5a6bcc5d70d123a50aa2c583fc638f495a98b678442740fe8d1c56171da3393a91e WHIRLPOOL 991b4b4bef9762020771cbac25f30bdee61a8b12068f801d3664b2996f150761705b75ad004c51088263315daecad5ed40d7b7c4f92800f32c97058c02444666 -EBUILD pymol-1.7.1.1.ebuild 2536 SHA256 b94323a5c165e3dbbdbbecdd42f5f6fb737a14138d8cdaff66a4bc8a399a25c4 SHA512 b78a9dad9131feab97c44f90eda4d5516e1d1bd9344f1fe9cf96db7d541850da263ac2d6c2f95c2db5982a83dcb8a1950a498c58a31b3c16a592a4ad34afd5f8 WHIRLPOOL acccc578ea5dfbb7a609d585adc525c08a7da18d9ee143d50e886f929a5c35b40d23aa5c731def1110bd5557abebde2fe0c842fe42866bafa3c966703393471f -EBUILD pymol-1.7.1.3.ebuild 2536 SHA256 f7f3f87e6b313bdfb17ccbcd129fcb860c64278974a41da1a125a91660b0f597 SHA512 d9b9fc4e7e63754979d4182fbc7037741d690f04dcbf98a173edcc3a4c5c3335fbd3cdea7ed81fe6ab1c0906a7ae7d9384344324e9ca572cf2cc93da2679853d WHIRLPOOL e7067c0440f010af0787ef00f8281ed3547ea2dd7a4668b7bd8c40088a8640af51fbd48ae723987b8ef66ce7c3d91bde05596df0ce133766b64854dc3c16f701 -EBUILD pymol-1.7.2.0.ebuild 2590 SHA256 e2f0fda771211143ea680aaeb70c30b61ef1af4b61d794847b96cb12fab06209 SHA512 d0582936d481aebd8892778e3419fc32c9546f4b26012ab05d54b635911f3059cf65200c34870171dcc02105054b808513f395ecab3dd74664f01d59665e5d37 WHIRLPOOL 3000d82af7189be8ec5ad3e95a5912e8d9df2dda45d1ba07eadf09ea0c7b6c4b127a6e83df5f350692beb50eb647bd11a2d70301314efa76daafbbd19ef641d0 -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 -EBUILD pymol-1.7.3.2.ebuild 2898 SHA256 c89a5ec7aa7bcb9c1f1f70ba59f9727cb46d496c01cf55373bd07c03118ad043 SHA512 2bcdda5839383d45de57aa4180b8dc65d7a03fb190ab48245be03337a34d68a863e1a9a2500a279f5b650ec8543920a47c2bff45cad995293ced86ae6cd1d8cc WHIRLPOOL 78166ba2fbfa89e182d90777ed7cab99ecadea128baf672a6d3ec18c824209c6c2fdc91e62410137d86d737897ac50dd9730de3cfe368b40f2ea12d47f391370 -EBUILD pymol-1.7.3.4.ebuild 2818 SHA256 47b644e61d5357d75c5c1614b86a1f18e782bc466051d4aa0dccd89d0e1f974e SHA512 244c62be72f06a7a994a246e499bb4acdd2f138bcb3da51a4fecd8377da1a33328261480310e66fd48ef2c8972ebe927213e2dc70155ab2e0252616a286ebd0d WHIRLPOOL 37cfdf272a42f0a27e057a0e5dad175f8b16de46f317241fddffc9c5b5e13df070d05c2169dd11a5974fe5ec954eda79a21040c3e1b36565214d7ac002778ac6 EBUILD pymol-1.7.4.0.ebuild 2821 SHA256 63cd5c552c78cadcfd392070558d92f7c46ab567062b460272c3228888e0a9c7 SHA512 dfca9ae9e6ec31a83920faee2597c467b2edf409f653f83b1fdd95318457b706091eacc367e541828540f7e54080d8b39e74d01cd5efb59a6ad90a86d25ccf0c WHIRLPOOL 84fac1ec944a9e52920963feb6bd30b0086d7dbc6738384bc0220bf0b1740a06cf94aaddaa3cfa649de4949a0a6239ee64f4f59eccd99bfe321378e0537c7707 -MISC ChangeLog 8003 SHA256 3ee1a7b38847e2c12f6554502da8f1ba62aa335ecde1d1fffd8f4343c3521a4d SHA512 0f20247f4dd8ad32921ca5e814a1308abd775918e72d955db1128e25d214a7f2d79c178c3a91194f3565721c9932bbdfc90a192cfdeb2a6f3e0f43a94f63238a WHIRLPOOL a8ed01392954e29763ec95649f766a72552ff13efb2e83b2dcc5cd87c584be00f816e1a11b8278fa00a5f288f15bc9e44b39030421bb0fdb95bbb0f8348cdbd9 -MISC metadata.xml 491 SHA256 7370aee92bf4088e8dc054dc8812cc30e98be7995570afae89dfacc49eec711b SHA512 319f8924b56ecb64e35892fa10ab94adbca68dc3d9dffc760d54e44fe19feb0e3bf87110aa7e94f25a353792e84610353f2f8684b6032426cd4eaa70fa5a9fdc WHIRLPOOL 93baebbb622f81fd48b7396bb3f98c8ce0d97db41c6a09e28da0cd923261961100cd715ada8f4ff70f79638cca88b0f1ab0b0ff78f9656323efcb871ea0958cf +MISC ChangeLog 9017 SHA256 695cebb939e8facbc662b4605f985a8be17f94357b13bbc3a1c133dbd43dea3d SHA512 3835a1f0eaccd2fe100dade808b3f08ab5b495dcbe0cefae710dacaaf5886e607115c73b0a2c17cb6c7eea692defc62e90cfc36d76e846fb8e588c9d2c135bc8 WHIRLPOOL 75b6bcf34cc63653230983e82e3873895378a1f7e7f100a778265c6d0915fed82d5acc04c542463eba1fc0b579eebeda92e8f38eedd8feb2526b1343f5433fe1 +MISC metadata.xml 376 SHA256 4de13f45628d433a0e4fe6be267845e0337af9a3ddcafc04f889203b072dedbe SHA512 a10bdede05d83e9833dab7a4f3066cfd9e85e938dae32df09fea3df7be3d5cff63b2e20c476ad1dc8d1adff2c785e9510ee428814c0045ecf3a02c8c06cab025 WHIRLPOOL c065b66cd575bbcbdc9727cdfa25b62bcb41f7e00a94f44b3942d3c1ee9faf867749efcd5e0c9e6611c6566c43f63ace25a5d0ddee2dec534eb6de47cc537f17 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iQEcBAEBCAAGBQJUwLFiAAoJECo/aRed92673roH/06CJMqsl2AFa55h+ozIEKF7 -7Axbhb7H7bnzZBRs347J4yQAbg7HQdtju7Yq3h/TMfD8iK2bfM9qsOdcaWW5ATa4 -xd2maQoL7tdXG3riZpUYPAFsc6lwiFbiRVRAFa9/2I9mzGkdzunVTM/6jbc5ZpYJ -nkBhV/4xAQZ5sIGupZA3y0x2I3gXehhIAhyZR4uLNeoxAXbGBAdKjmMHllhMuyAR -oU/xZiK3GmjhfrstmsEWoFQLSGBvYOvXSXqiun3Xmlv52ahY4Xz0uefFSNhgwT2b -sFbg10uypxHfK9eDLt6mHU6mz7UYTaeDs+XVVDjVJNbIWc4GY1i8+75aqcS8i7U= -=dc1O +iQJ8BAEBCgBmBQJUwL2qXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViroAUP/jNuVNqW5voweJcmhXsj0JhM +mqT1BDyyTeyY9pG9+JP/J2vYiGCCa8ygGZJ4EBhI4sUKQHJSdTosOkQOMemzQjnf +H4xsLwtSt7eAleUlo3lABYJMtBhErbQ6Da48OyK6xQQvLfPkPZGGi5JeUTsKpHfY +/UQuuXFT0waKfqj+RTKXVsKsP86+5rgSTiyvrCMUzngA6MHP+s8LLB77AVfAoIej +dqhEecgZHwLIq2/tA75OA+nZucfyH5Ve3wcWfB9wjVZTE9tAgo7GZKe5y3MMWgMp +9FKekMaJSiVkjPFmG1bB6omVISnwjZlLiHIdru62ee7s3nUxApVdq3b0X3wJMiy+ +OZH2gSP/ggsfeOnt5ygrlJipihQrC6n46c8mNr/pM9dd82oFdZb/aGjMMiULgEjL +tnHbr2m6vxTg03KxOuM5xbfO/4PRZOK0tZH9Wg0uyXtYRs1F2fT5bmhprXVw+Ih6 +t2uZ/y1YmkG2r0XQI5FtNnLZoZcc2FB5Pa3xrRUMNuH1p9WzvzqcxyKyP+Z5sqnT +gELgKH+ELnRIkrbGyPyKeW+Ew7AM/NC74GPOd8eJ6vBc/rYtQtQouGbBt5FhLgAd +1m/Q6nagWzew7gGuj2bzyFpMNwMHH1kIdXrUNmUFgT/YjXVLo6ikVtsdCHC/rX4R +fBY86GbDOyzLNQJzvuqb +=2OSb -----END PGP SIGNATURE----- diff --git a/sci-chemistry/pymol/files/1.2.1/nosplash-gentoo.patch b/sci-chemistry/pymol/files/1.2.1/nosplash-gentoo.patch deleted file mode 100644 index 3125b285696c..000000000000 --- a/sci-chemistry/pymol/files/1.2.1/nosplash-gentoo.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- modules/pymol/invocation.py 2009-06-25 17:26:27.000000000 +0200 -+++ modules/pymol/invocation.py.new 2009-06-25 17:41:57.000000000 +0200 -@@ -395,6 +395,4 @@ - if loaded_something and (options.after_load_script!=""): - options.deferred.append(options.after_load_script) - options.deferred.extend(final_actions) -- if options.show_splash and not options.no_gui and not restricted: -- options.deferred.insert(0,"_do__ cmd.splash(1)") - diff --git a/sci-chemistry/pymol/files/pymol-1.5.0.1-data-path.patch b/sci-chemistry/pymol/files/pymol-1.5.0.1-data-path.patch deleted file mode 100644 index a2b09bb9eee3..000000000000 --- a/sci-chemistry/pymol/files/pymol-1.5.0.1-data-path.patch +++ /dev/null @@ -1,151 +0,0 @@ - layer0/ShaderMgr.c | 16 ++++++++-------- - layer1/Setting.c | 2 +- - modules/chempy/__init__.py | 2 +- - modules/chempy/tinker/__init__.py | 2 +- - modules/pymol/commanding.py | 6 +++--- - modules/pymol/importing.py | 2 +- - modules/pymol/wizard/mutagenesis.py | 8 ++++---- - 7 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/layer0/ShaderMgr.c b/layer0/ShaderMgr.c -index cc760ae..364277f 100644 ---- a/layer0/ShaderMgr.c -+++ b/layer0/ShaderMgr.c -@@ -385,7 +385,7 @@ int CShaderMgr_ShadersPresent(CShaderMgr * I) - char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) { - FILE* f; - long size; -- char* buffer = NULL, *p, *pymol_path, *shader_path, *fullFile; -+ char* buffer = NULL, *p, *pymol_data, *shader_path, *fullFile; - size_t res; - - PRINTFB(G, FB_ShaderMgr, FB_Debugging) -@@ -398,16 +398,16 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) { - return NULL; - } - -- pymol_path = getenv("PYMOL_PATH"); -- if (!pymol_path){ -+ pymol_data = getenv("PYMOL_DATA"); -+ if (!pymol_data){ - PRINTFB(G, FB_ShaderMgr, FB_Warnings) -- " PyMOLShader_NewFromFile-Warning: PYMOL_PATH not set, cannot read shader config files from disk\n" ENDFB(G); -+ " PyMOLShader_NewFromFile-Warning: PYMOL_DATA not set, cannot read shader config files from disk\n" ENDFB(G); - return NULL; - } - /* make this a setting */ -- shader_path = "/data/shaders/"; -- fullFile = malloc( sizeof(char) * (strlen(pymol_path)+strlen(shader_path)+strlen(fileName)+1)); -- fullFile = strcpy(fullFile, pymol_path); -+ shader_path = "/shaders/"; -+ fullFile = malloc( sizeof(char) * (strlen(pymol_data)+strlen(shader_path)+strlen(fileName)+1)); -+ fullFile = strcpy(fullFile, pymol_data); - fullFile = strcat(fullFile, shader_path); - fullFile = strcat(fullFile, fileName); - -@@ -416,7 +416,7 @@ char * CShaderMgr_ReadShaderFromDisk(PyMOLGlobals * G, const char * fileName) { - - if (!f) { - PRINTFB(G, FB_ShaderMgr, FB_Errors) -- " PyMOLShader_NewFromFile-Error: Unable to open file '%s' PYMOL_PATH='%s'\n", fullFile, pymol_path ENDFB(G); -+ " PyMOLShader_NewFromFile-Error: Unable to open file '%s' PYMOL_DATA='%s'\n", fullFile, pymol_data ENDFB(G); - return NULL; - } else { - PRINTFB(G, FB_ShaderMgr, FB_Blather) -diff --git a/layer1/Setting.c b/layer1/Setting.c -index c2b8bbb..4c6fdb7 100644 ---- a/layer1/Setting.c -+++ b/layer1/Setting.c -@@ -4375,7 +4375,7 @@ void SettingInitGlobal(PyMOLGlobals * G, int alloc, int reset_gui, int use_defau - set_b(I, cSetting_line_use_shader, 1); - set_b(I, cSetting_sphere_use_shader, 1); - set_b(I, cSetting_use_shaders, 0); -- set_s(I, cSetting_shader_path, "data/shaders"); -+ set_s(I, cSetting_shader_path, "shaders"); - set_i(I, cSetting_volume_bit_depth, 8); - set_color(I, cSetting_volume_color, "-1"); - set_f(I, cSetting_volume_layers, 256); -diff --git a/modules/chempy/__init__.py b/modules/chempy/__init__.py -index 23dbe45..795a223 100644 ---- a/modules/chempy/__init__.py -+++ b/modules/chempy/__init__.py -@@ -235,7 +235,7 @@ if os.environ.has_key('CHEMPY_DATA'): # - elif os.environ.has_key('PYMOL_DATA'): - path = os.environ['PYMOL_DATA'] + '/chempy/' - elif os.environ.has_key('PYMOL_PATH'): -- path = os.environ['PYMOL_PATH'] + '/data/chempy/' -+ path = os.environ['PYMOL_PATH'] + '/chempy/' - elif os.environ.has_key('FREEMOL_MODULES'): - path = os.environ['FREEMOL_MODULES'] + '/chempy/' - else: -diff --git a/modules/chempy/tinker/__init__.py b/modules/chempy/tinker/__init__.py -index a2d8eb1..1e48f81 100644 ---- a/modules/chempy/tinker/__init__.py -+++ b/modules/chempy/tinker/__init__.py -@@ -147,7 +147,7 @@ else: - - if os.environ.has_key('PYMOL_PATH'): - pymol_path = os.environ['PYMOL_PATH'] -- test_path = pymol_path + '/data/chempy/tinker/' -+ test_path = pymol_path + '/chempy/tinker/' - if os.path.exists(test_path): - params_path = test_path - -diff --git a/modules/pymol/commanding.py b/modules/pymol/commanding.py -index 5a202d0..5cb27a6 100644 ---- a/modules/pymol/commanding.py -+++ b/modules/pymol/commanding.py -@@ -219,11 +219,11 @@ USAGE - _self.unlock(0,_self) - r = DEFAULT_SUCCESS - if show_splash==1: # generic / open-source -- png_path = _self.exp_path("$PYMOL_PATH/data/pymol/splash.png") -+ png_path = _self.exp_path("$PYMOL_DATA/pymol/splash.png") - elif show_splash==2: # evaluation builds -- png_path = _self.exp_path("$PYMOL_PATH/data/pymol/epymol.png") -+ png_path = _self.exp_path("$PYMOL_DATA/pymol/epymol.png") - else: # incentive builds -- png_path = _self.exp_path("$PYMOL_PATH/data/pymol/ipymol.png") -+ png_path = _self.exp_path("$PYMOL_DATA/pymol/ipymol.png") - if os.path.exists(png_path): - _self.do("_ cmd.load_png('%s',0,quiet=1)"%png_path) - else: -diff --git a/modules/pymol/importing.py b/modules/pymol/importing.py -index 457ace7..7cc2953 100644 ---- a/modules/pymol/importing.py -+++ b/modules/pymol/importing.py -@@ -191,7 +191,7 @@ SEE ALSO - ''' - r = DEFAULT_ERROR - -- tables = { 'cmyk' : "$PYMOL_PATH/data/pymol/cmyk.png", -+ tables = { 'cmyk' : "$PYMOL_DATA/pymol/cmyk.png", - 'pymol' : 'pymol', - 'rgb' : 'rgb', - 'greyscale': 'greyscale' } -diff --git a/modules/pymol/wizard/mutagenesis.py b/modules/pymol/wizard/mutagenesis.py -index 8a5250d..6c1b26c 100644 ---- a/modules/pymol/wizard/mutagenesis.py -+++ b/modules/pymol/wizard/mutagenesis.py -@@ -52,8 +52,8 @@ class Mutagenesis(Wizard): - - self.dep = default_dep - -- self.ind_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+ -- "/data/chempy/sidechains/sc_bb_ind.pkl") -+ self.ind_library = io.pkl.fromFile(os.environ['PYMOL_DATA']+ -+ "/chempy/sidechains/sc_bb_ind.pkl") - self.load_library() - self.status = 0 # 0 no selection, 1 mutagenizing - self.bump_check = 1 -@@ -217,8 +217,8 @@ class Mutagenesis(Wizard): - def load_library(self): - if self.dep == 'dep': - if not hasattr(self,'dep_library'): -- self.dep_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+ -- "/data/chempy/sidechains/sc_bb_dep.pkl") -+ self.dep_library = io.pkl.fromFile(os.environ['PYMOL_DATA']+ -+ "/chempy/sidechains/sc_bb_dep.pkl") - - def set_mode(self,mode): - cmd=self.cmd diff --git a/sci-chemistry/pymol/files/pymol-1.5.0.1-flags.patch b/sci-chemistry/pymol/files/pymol-1.5.0.1-flags.patch deleted file mode 100644 index 9bdba45f3b1f..000000000000 --- a/sci-chemistry/pymol/files/pymol-1.5.0.1-flags.patch +++ /dev/null @@ -1,19 +0,0 @@ - setup.py | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index 2b6fa35..9c0556d 100755 ---- a/setup.py -+++ b/setup.py -@@ -197,10 +197,7 @@ else: # linux or other unix - ("_PYMOL_GL_CALLLISTS",None), - ("OPENGL_ES_2",None), - ] -- ext_comp_args = [ "-ffast-math", -- "-funroll-loops", -- "-O3", -- "-g" ] -+ ext_comp_args = [] - ext_link_args = [] - - diff --git a/sci-chemistry/pymol/files/pymol-1.5.0.1-setup.py.patch b/sci-chemistry/pymol/files/pymol-1.5.0.1-setup.py.patch deleted file mode 100644 index 076d6907a183..000000000000 --- a/sci-chemistry/pymol/files/pymol-1.5.0.1-setup.py.patch +++ /dev/null @@ -1,39 +0,0 @@ - setup.py | 28 ---------------------------- - 1 files changed, 0 insertions(+), 28 deletions(-) - -diff --git a/setup.py b/setup.py -index 18866a2..705b0c5 100755 ---- a/setup.py -+++ b/setup.py -@@ -487,31 +487,3 @@ distribution = setup ( # Distribution meta-data - define_macros = def_macros - ) - ]) -- --# make available for setup2.py --try: -- site_packages = distribution.command_obj['install'].install_libbase --except KeyError: -- print """ -- Error: Please run, 'setup.py install' not 'setup build' or other variant. -- --""" -- sys.exit(2) -- --f = open('setup3.py', 'w') --print >> f, 'site_packages =', repr(site_packages) --f.close() -- --print ''' -- After running: -- -- python setup.py install -- -- Please run, to complete the installation: -- -- python setup2.py install -- -- To uninstall PyMOL, run: -- -- python setup2.py uninstall --''' diff --git a/sci-chemistry/pymol/files/pymol-1.5.0.1-vmd.patch b/sci-chemistry/pymol/files/pymol-1.5.0.1-vmd.patch deleted file mode 100644 index cf47082efb2b..000000000000 --- a/sci-chemistry/pymol/files/pymol-1.5.0.1-vmd.patch +++ /dev/null @@ -1,36 +0,0 @@ - setup.py | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index 366d552..ce0d271 100755 ---- a/setup.py -+++ b/setup.py -@@ -161,8 +161,8 @@ else: # linux or other unix - "layer5", - "/usr/include/freetype2", - # VMD plugin support -- # "contrib/uiuc/plugins/include", -- # "contrib/uiuc/plugins/molfile_plugin/src", -+ "contrib/uiuc/plugins/include", -+ "contrib/uiuc/plugins/molfile_plugin/src", - "modules/cealign/src", - "modules/cealign/src/tnt", - "generated/include", -@@ -190,7 +190,7 @@ else: # linux or other unix - # Numeric Python support - # ("_PYMOL_NUMPY",None), - # VMD plugin support -- # ("_PYMOL_VMD_PLUGINS",None) -+ ("_PYMOL_VMD_PLUGINS",None), - ("_PYMOL_CGO_DRAWARRAYS",None), - ("_PYMOL_CGO_DRAWBUFFERS",None), - ("_CGO_DRAWARRAYS",None), -@@ -354,7 +354,7 @@ distribution = setup ( # Distribution meta-data - "layer5/main.c" - # VMD plugin support - # switch the 0 to 1 to activate the additional source code -- ] + 0 * [ -+ ] + 1 * [ - # (incomplete support -- only TRJ, TRR, XTC, DCD so far...) - 'contrib/uiuc/plugins/molfile_plugin/src/PlugIOManagerInit.c', - 'contrib/uiuc/plugins/molfile_plugin/src/avsplugin.cpp', diff --git a/sci-chemistry/pymol/files/pymol-1.5.0.1-web.patch b/sci-chemistry/pymol/files/pymol-1.5.0.1-web.patch deleted file mode 100644 index fe61f0264f0b..000000000000 --- a/sci-chemistry/pymol/files/pymol-1.5.0.1-web.patch +++ /dev/null @@ -1,19 +0,0 @@ - setup.py | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index 18866a2..366d552 100755 ---- a/setup.py -+++ b/setup.py -@@ -229,10 +229,7 @@ distribution = setup ( # Distribution meta-data - 'pymol/opengl/gl', - 'pymol/opengl/glu', - 'pymol/opengl/glut', -- 'pymol/wizard', -- 'web', -- 'web/examples', -- 'web/javascript', ], -+ 'pymol/wizard', ], - ext_modules = [ - Extension("pymol._cmd", [ - "modules/cealign/src/ccealignmodule.cpp", diff --git a/sci-chemistry/pymol/files/pymol-1.5.0.3-prefix.patch b/sci-chemistry/pymol/files/pymol-1.5.0.3-prefix.patch deleted file mode 100644 index 9b0bad342e19..000000000000 --- a/sci-chemistry/pymol/files/pymol-1.5.0.3-prefix.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: setup.py -=================================================================== ---- setup.py (revision 3983) -+++ setup.py (working copy) -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/env python - # - # This script only applies if you are performing a Python Distutils-based - # installation of PyMOL. -@@ -35,7 +35,7 @@ - "modules/cealign/src/tnt" ] - libs=["glut32","opengl32","glu32","png"] - pyogl_libs = ["glut32","opengl32","glu32"] -- lib_dirs=["/usr/lib/w32api"] -+ lib_dirs=["@GENTOO_PORTAGE_EPREFIX@/usr/lib/w32api"] - def_macros=[("_PYMOL_MODULE",None), - ("CYGWIN",None), - ("_PYMOL_LIBPNG",None)] -@@ -87,7 +87,7 @@ - "/sw/include/freetype2/freetype", - "/sw/include/freetype2", - "/sw/include", -- "/usr/X11/include", -+ "@GENTOO_PORTAGE_EPREFIX@/usr/X11/include", - "modules/cealign/src", - "modules/cealign/src/tnt", - #"contrib/uiuc/plugins/include/", -@@ -114,8 +114,8 @@ - ext_comp_args=[] - ext_link_args=[ - "-L/sw/lib", "-lpng", -- "/usr/X11/lib/libGL.dylib", -- "/usr/X11/lib/libGLU.dylib", -+ "@GENTOO_PORTAGE_EPREFIX@/usr/X11/lib/libGL.dylib", -+ "@GENTOO_PORTAGE_EPREFIX@/usr/X11/lib/libGLU.dylib", - "-lfreeglut", - "-lglew", - "-L/sw/lib/freetype219/lib", "-lfreetype" -@@ -221,7 +221,7 @@ - "layer3", - "layer4", - "layer5", -- "/usr/include/freetype2", -+ "@GENTOO_PORTAGE_EPREFIX@/usr/include/freetype2", - # VMD plugin support - # "contrib/uiuc/plugins/include", - # "contrib/uiuc/plugins/molfile_plugin/src", -@@ -242,7 +242,7 @@ - "GLU", - "glut", - "GLEW"] -- lib_dirs = [ "/usr/X11R6/lib64", ] -+ lib_dirs = [ "@GENTOO_PORTAGE_EPREFIX@/usr/X11R6/lib64", ] - def_macros = [ ("_PYMOL_MODULE",None), - ("_PYMOL_INLINE",None), - ("_PYMOL_FREETYPE",None), diff --git a/sci-chemistry/pymol/files/pymol-1.5.0.3-web.patch b/sci-chemistry/pymol/files/pymol-1.5.0.3-web.patch deleted file mode 100644 index 4f48140169cc..000000000000 --- a/sci-chemistry/pymol/files/pymol-1.5.0.3-web.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: setup.py -=================================================================== ---- setup.py (revision 3983) -+++ setup.py (working copy) -@@ -292,10 +292,7 @@ - 'pymol/opengl/glu', - 'pymol/opengl/glut', - 'pymol/wizard', -- 'pymol2', -- 'web', -- 'web/examples', -- 'web/javascript', ], -+ 'pymol2', ], - ext_modules = [ - Extension("pymol._cmd", [ - "modules/cealign/src/ccealignmodule.cpp", diff --git a/sci-chemistry/pymol/files/pymol-1.6.0.0-bg_rgb.patch b/sci-chemistry/pymol/files/pymol-1.6.0.0-bg_rgb.patch deleted file mode 100644 index 39fcbc019bbe..000000000000 --- a/sci-chemistry/pymol/files/pymol-1.6.0.0-bg_rgb.patch +++ /dev/null @@ -1,254 +0,0 @@ -Index: pymol/setup.py -=================================================================== ---- pymol/setup.py (revision 4031) -+++ pymol/setup.py (revision 4032) -@@ -123,10 +123,10 @@ - out.write('"%s" "%s"' % (python_exe, pymol_file)) - out.write(' %1 %2 %3 %4 %5 %6 %7 %8 %9' + os.linesep) - else: -- out.write('#!/bin/sh' + os.linesep) -+ out.write('#!/bin/bash' + os.linesep) - if sys.platform.startswith('darwin'): -- out.write('if [ "$DISPLAY" == "" ]; then DISPLAY=":0.0"; export DISPLAY; fi' + os.linesep) -- out.write('PYMOL_PATH="%s"; export PYMOL_PATH' % pymol_path + os.linesep) -+ out.write('[ "$DISPLAY" == "" ] && export DISPLAY=":0.0"' + os.linesep) -+ out.write('export PYMOL_PATH="%s"' % pymol_path + os.linesep) - out.write('"%s" "%s" "$@"' % (python_exe, pymol_file) + os.linesep) - - os.chmod(launch_script, 0755) -@@ -135,12 +135,16 @@ - - #============================================================================ - -+# should be something like (build_base + "/generated"), but that's only -+# known to build and install instances -+generated_dir = os.path.join(os.environ.get("PYMOL_BLD", "build"), "generated") -+ - import create_shadertext - create_shadertext.create_shadertext( - "data/shaders", - "shadertext.txt", -- "generated/include/ShaderText.h", -- "generated/src/ShaderText.c") -+ generated_dir + "/ShaderText.h", -+ generated_dir + "/ShaderText.c") - - pymol_src_dirs = [ - "ov/src", -@@ -152,12 +156,10 @@ - "layer5", - "modules/cealign/src", - "modules/cealign/src/tnt", -- 'generated/src', -- 'generated/include', -+ generated_dir, - ] - - def_macros = [ -- ("_PYMOL_MODULE", None), - ] - - libs = [] -@@ -226,27 +228,32 @@ - - for prefix in prefix_path: - inc_dirs += filter(os.path.isdir, [prefix + s for s in ["/include", "/include/freetype2"]]) -- lib_dirs += filter(os.path.isdir, [prefix + s for s in ["/lib"]]) -+ lib_dirs += filter(os.path.isdir, [prefix + s for s in ["/lib64", "/lib"]]) - - glut = posix_find_lib(['glut', 'freeglut'], lib_dirs) -- for _libs in (libs, pyogl_libs): -- _libs += ["GL", "GLU", "GLEW", glut] - -- ext_comp_args = ["-ffast-math", "-funroll-loops", "-O3", "-fcommon"] -+ libs += ["GLEW"] -+ pyogl_libs += ["GL", "GLU", glut] - -+ libs += pyogl_libs -+ -+ ext_comp_args += ["-ffast-math", "-funroll-loops", "-O3", "-fcommon"] -+ - def get_pymol_version(): - return re.findall(r'_PyMOL_VERSION "(.*)"', open('layer0/Version.h').read())[0] - - def get_sources(subdirs, suffixes=('.c', '.cpp')): - return [f for d in subdirs for s in suffixes for f in glob(d + '/*' + s)] - --def get_packages(base, parent='', r=[]): -+def get_packages(base, parent='', r=None): - from os.path import join, exists -+ if r is None: -+ r = [] - if parent: - r.append(parent) - for name in os.listdir(join(base, parent)): - if '.' not in name and exists(join(base, parent, name, '__init__.py')): -- get_packages(base, join(parent, name)) -+ get_packages(base, join(parent, name), r) - return r - - def pyogl_extension(name, sources): -@@ -260,7 +267,10 @@ - author = "Schrodinger", - url = "http://pymol.org", - contact = "pymol-users@lists.sourceforge.net", -- description = "PyMOL is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source PyMOL is free to everyone!", -+ description = ("PyMOL is a Python-enhanced molecular graphics tool. " -+ "It excels at 3D visualization of proteins, small molecules, density, " -+ "surfaces, and trajectories. It also includes molecular editing, " -+ "ray tracing, and movies. Open Source PyMOL is free to everyone!"), - - package_dir = {'' : 'modules'}, - packages = get_packages('modules'), -Index: pymol/ChangeLog -=================================================================== ---- pymol/ChangeLog (revision 4031) -+++ pymol/ChangeLog (revision 4032) -@@ -2,6 +2,12 @@ - CHANGE LOG - ========================================================================= - -+2013-06-18 Blaine Bell, Thomas Holder -+ -+ * fixed loading in bg_rgb settings from old project pse files -+ -+ * add URL support for run command -+ - 2013-06-13 Blaine Bell <blaine.bell@schrodinger.com> - - * fixed labels when use_shaders is 0 and show_frame_rate is on -Index: pymol/layer1/Setting.c -=================================================================== ---- pymol/layer1/Setting.c (revision 4031) -+++ pymol/layer1/Setting.c (revision 4032) -@@ -41,6 +41,7 @@ - #include"ShaderMgr.h" - #include"Sphere.h" - #include"Selector.h" -+#include"Parse.h" - - static void *SettingPtr(CSetting * I, int index, ov_size size); - -@@ -920,43 +921,67 @@ - set_type = false; - break; - default: -- if(ok) -- switch (setting_type) { -- case cSetting_boolean: -- case cSetting_int: -- ok = PConvPyIntToInt(PyList_GetItem(list, 2), -- (int *) SettingPtr(I, index, sizeof(int))); -- break; -- case cSetting_color: -- { -- int color = 0; -- ok = PConvPyIntToInt(PyList_GetItem(list, 2), &color); -- if(ok) -- color = ColorConvertOldSessionIndex(I->G, color); -- *((int *) SettingPtr(I, index, sizeof(int))) = color; -- } -- break; -- case cSetting_float: -- ok = PConvPyFloatToFloat(PyList_GetItem(list, 2), -- (float *) SettingPtr(I, index, sizeof(float))); -- break; -- case cSetting_float3: -- ok = PConvPyListToFloatArrayInPlaceAutoZero(PyList_GetItem(list, 2), -- (float *) SettingPtr(I, index, -- 3 * -- sizeof -- (float)), 3); -- break; -- case cSetting_string: -- ok = PConvPyStrToStrPtr(PyList_GetItem(list, 2), &str); -- if(ok) { -- strcpy(((char *) SettingPtr(I, index, strlen(str) + 1)), str); -- } -- break; -- } -+ if(ok){ -+ int skip = false; -+ switch (index){ -+ case cSetting_bg_rgb: -+ case cSetting_bg_rgb_top: -+ case cSetting_bg_rgb_bottom: -+ if (setting_type == cSetting_float3){ -+ float vals[3]; -+ ok = PConvPyListToFloatArrayInPlaceAutoZero(PyList_GetItem(list, 2), (float*)&vals, 3); -+ if (ok){ -+ SettingSet_color_from_3f(I, index, vals); -+ setting_type = cSetting_color; -+ skip = true; -+ } -+ } else if (setting_type == cSetting_color){ -+ int color = 0; -+ ok = PConvPyIntToInt(PyList_GetItem(list, 2), &color); -+ if(ok) -+ color = ColorConvertOldSessionIndex(I->G, color); -+ *((int *) SettingPtr(I, index, sizeof(int))) = color; -+ } -+ } -+ if (!skip){ -+ switch (setting_type) { -+ case cSetting_boolean: -+ case cSetting_int: -+ ok = PConvPyIntToInt(PyList_GetItem(list, 2), -+ (int *) SettingPtr(I, index, sizeof(int))); -+ break; -+ case cSetting_color: -+ { -+ int color = 0; -+ ok = PConvPyIntToInt(PyList_GetItem(list, 2), &color); -+ if(ok) -+ color = ColorConvertOldSessionIndex(I->G, color); -+ *((int *) SettingPtr(I, index, sizeof(int))) = color; -+ } -+ break; -+ case cSetting_float: -+ ok = PConvPyFloatToFloat(PyList_GetItem(list, 2), -+ (float *) SettingPtr(I, index, sizeof(float))); -+ break; -+ case cSetting_float3: -+ ok = PConvPyListToFloatArrayInPlaceAutoZero(PyList_GetItem(list, 2), -+ (float *) SettingPtr(I, index, -+ 3 * -+ sizeof -+ (float)), 3); -+ break; -+ case cSetting_string: -+ ok = PConvPyStrToStrPtr(PyList_GetItem(list, 2), &str); -+ if(ok) { -+ strcpy(((char *) SettingPtr(I, index, strlen(str) + 1)), str); -+ } -+ break; -+ } -+ } -+ } - } - if(ok && set_type) -- I->info[index].type = setting_type; -+ I->info[index].type = setting_type; - } - } - return (ok); -Index: pymol/modules/pymol/parsing.py -=================================================================== ---- pymol/modules/pymol/parsing.py (revision 4031) -+++ pymol/modules/pymol/parsing.py (revision 4032) -@@ -437,6 +437,15 @@ - - # launching routines - -+ def execfile(filename, global_ns, local_ns): -+ if '://' in filename: -+ import pymol.internal as pi -+ co = compile(pi.file_read(filename), filename, 'exec') -+ exec(co, global_ns, local_ns) -+ else: -+ import __builtin__ as b -+ b.execfile(filename, global_ns, local_ns) -+ - def run_file(file,global_ns,local_ns): - pymol.__script__ = file - try: diff --git a/sci-chemistry/pymol/files/pymol-1.6.0.0-labels.patch b/sci-chemistry/pymol/files/pymol-1.6.0.0-labels.patch deleted file mode 100644 index 170ab2edcd95..000000000000 --- a/sci-chemistry/pymol/files/pymol-1.6.0.0-labels.patch +++ /dev/null @@ -1,372 +0,0 @@ -Index: pymol/ChangeLog -=================================================================== ---- pymol/ChangeLog (revision 4030) -+++ pymol/ChangeLog (revision 4031) -@@ -2,6 +2,16 @@ - CHANGE LOG - ========================================================================= - -+2013-06-13 Blaine Bell <blaine.bell@schrodinger.com> -+ -+ * fixed labels when use_shaders is 0 and show_frame_rate is on -+ -+2013-06-12 Thomas Holder <thomas.holder@schrodinger.com> -+ -+ * update APBS Tools plugin -+ -+ * fix spectrumany when minimum/maximum are provided -+ - 2013-06-11 Blaine Bell <blaine.bell@schrodinger.com> - - * Open Source PyMOL v1.6.0.0 -Index: pymol/layer1/Character.c -=================================================================== ---- pymol/layer1/Character.c (revision 4030) -+++ pymol/layer1/Character.c (revision 4031) -@@ -276,16 +276,16 @@ - rec->extent[2], rec->extent[1], - rec->extent[2], rec->extent[3] - }; -- glEnableClientState(GL_VERTEX_ARRAY); -- glEnableClientState(GL_TEXTURE_COORD_ARRAY); --#ifdef OPENGL_ES_1 -- glClientActiveTexture(GL_TEXTURE1); --#endif -- glVertexPointer(3, GL_FLOAT, 0, vertexVals); -- glTexCoordPointer(2, GL_FLOAT, 0, texVals); -- glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); -- glDisableClientState(GL_VERTEX_ARRAY); -- glDisableClientState(GL_TEXTURE_COORD_ARRAY); -+ glBegin(GL_QUADS); -+ glTexCoord2f(rec->extent[0], rec->extent[1]); -+ glVertex3f(v0[0], v0[1], v0[2]); -+ glTexCoord2f(rec->extent[0], rec->extent[3]); -+ glVertex3f(v0[0], v1[1], v0[2]); -+ glTexCoord2f(rec->extent[2], rec->extent[3]); -+ glVertex3f(v1[0], v1[1], v0[2]); -+ glTexCoord2f(rec->extent[2], rec->extent[1]); -+ glVertex3f(v1[0], v0[1], v0[2]); -+ glEnd(); - } - } - } -Index: pymol/modules/pymol/__init__.py -=================================================================== ---- pymol/modules/pymol/__init__.py (revision 4030) -+++ pymol/modules/pymol/__init__.py (revision 4031) -@@ -252,9 +252,11 @@ - # auto-detect bundled FREEMOL (if present) - - if not os.environ.has_key("FREEMOL"): -- test_path = os.path.join(os.environ['PYMOL_PATH'],"freemol") -- if os.path.isdir(test_path): -- os.environ['FREEMOL'] = test_path -+ for test_path in ['freemol', 'ext']: -+ test_path = os.path.join(os.environ['PYMOL_PATH'], test_path) -+ if os.path.isdir(test_path): -+ os.environ['FREEMOL'] = test_path -+ break - - # include FREEMOL's libpy in sys.path (if present) - -@@ -339,9 +341,6 @@ - elif vendor.startswith('Parallels'): - if renderer[0:8]=='Parallel': - pass -- # this was critical for older Parallels -- # but actually slows down current versions -- # cmd.set('texture_fonts',1) - - elif vendor.startswith('ATI'): - if renderer[0:17]=='FireGL2 / FireGL3': # obsolete ? -Index: pymol/modules/pymol/preset.py -=================================================================== ---- pymol/modules/pymol/preset.py (revision 4030) -+++ pymol/modules/pymol/preset.py (revision 4031) -@@ -21,7 +21,7 @@ - - tmp_sele = "_p_tmp" - --prot_and_dna_sele = "(resn ALA+CYS+CYX+ASP+GLU+PHE+GLY+HIS+HID+HIE+HIP+HISE+HISD+HISP+ILE+LYS+LEU+MET+MSE+ASN+PRO+GLN+ARG+SER+THR+VAL+TRP+TYR+A+C+T+G+U)" -+prot_and_dna_sele = "(resn ALA+CYS+CYX+ASP+GLU+PHE+GLY+HIS+HID+HIE+HIP+HISE+HISD+HISP+ILE+LYS+LEU+MET+MSE+ASN+PRO+GLN+ARG+SER+THR+VAL+TRP+TYR+A+C+T+G+U+DA+DC+DT+DG+DU+DI)" - wat_sele = "(resn WAT,H2O,HOH,TIP)" - ion_sele = "(resn CA,HG,K,NA,ZN,MG,CL)" - solv_sele = "("+wat_sele+"|"+ion_sele+")" -Index: pymol/modules/pymol/cmd.py -=================================================================== ---- pymol/modules/pymol/cmd.py (revision 4030) -+++ pymol/modules/pymol/cmd.py (revision 4031) -@@ -310,8 +310,7 @@ - selection_sc = lambda sc=Shortcut,gn=get_names:sc(gn('public')+['all']) - object_sc = lambda sc=Shortcut,gn=get_names:sc(gn('objects')) - map_sc = lambda sc=Shortcut,gnot=get_names_of_type:sc(gnot('object:map')) -- contour_sc = lambda sc=Shortcut,gnot=get_names_of_type:sc( -- gnot('object:mesh')+gnot('object:surface')) -+ contour_sc = lambda sc=Shortcut,gnot=get_names_of_type:sc(gnot('object:mesh')+gnot('object:surface')) - group_sc = lambda sc=Shortcut,gnot=get_names_of_type:sc(gnot('object:group')) - - # Table for argument autocompletion -Index: pymol/modules/pymol/viewing.py -=================================================================== ---- pymol/modules/pymol/viewing.py (revision 4030) -+++ pymol/modules/pymol/viewing.py (revision 4031) -@@ -1393,9 +1393,9 @@ - if action=='clear': - for key in pymol._scene_dict.keys(): - # free selections -- list = pymol._scene_dict[key] -- if len(list)>3: -- colorection = list[3] -+ scene_list = pymol._scene_dict[key] -+ if len(scene_list)>3: -+ colorection = scene_list[3] - if colorection!=None: - _self.del_colorection(colorection,key) - name = "_scene_"+key+"_*" -@@ -1427,6 +1427,8 @@ - print "Error: scene '%s' not found."%key - elif new_key==None: - print "Error: must provide the 'new_key' argument" -+ elif new_key == key: -+ print "scene: '%s' not changed" % key - else: - new_scene_order = [] - for a in pymol._scene_order: -@@ -1443,9 +1445,9 @@ - if name in valid_names: - new_name = "_scene_"+new_key+"_"+rep_name - _self.set_name(name,new_name) -- list = pymol._scene_dict[new_key] -- if len(list)>3: -- _self.set_colorection_name(list[3],key,new_key) -+ scene_list = pymol._scene_dict[new_key] -+ if len(scene_list)>3: -+ _self.set_colorection_name(scene_list[3],key,new_key) - print" scene: '%s' renamed to '%s'."%(key,new_key) - pymol._scene_dict_sc.rebuild( pymol._scene_dict.keys()) - _self.set("session_changed",1,quiet=1) -@@ -1464,29 +1466,29 @@ - _self.set("scenes_changed",1,quiet=1); - key = pymol._scene_dict_sc.auto_err(key,'scene') - _self.set('scene_current_name', key, quiet=1) -- list = pymol._scene_dict[key] -- ll = len(list) -+ scene_list = pymol._scene_dict[key] -+ ll = len(scene_list) - if (ll>1) and (active): -- if list[1]!=None: -+ if scene_list[1]!=None: - _self.disable() - _self.deselect() -- _self.set_vis(list[1]) -+ _self.set_vis(scene_list[1]) - if (ll>2) and (frame): -- if list[2]!=None: -+ if scene_list[2]!=None: - if not _self.get_movie_playing(): # don't set frame when movie is already playing -- if _self.get_frame()!=list[2]: # only set the frame when it isn't already correct -- _self.frame(list[2],scene=1) # let frame know that it is being set by a scene -+ if _self.get_frame()!=scene_list[2]: # only set the frame when it isn't already correct -+ _self.frame(scene_list[2],scene=1) # let frame know that it is being set by a scene - else: - _self.set_frame(1,10) # seek scene - if (ll>3) and (color): -- if list[3]!=None: -- _self.set_colorection(list[3],key) -+ if scene_list[3]!=None: -+ _self.set_colorection(scene_list[3],key) - if (ll>4) and (rep): -- if list[4]==None: -+ if scene_list[4]==None: - rep = 0 - if (ll>5) and (message==None): -- if list[5]!=None: -- message=list[5] -+ if scene_list[5]!=None: -+ message=scene_list[5] - if rep!=0: - _self.hide("(all)") - valid_names = _self.get_names("all") -@@ -1521,8 +1523,8 @@ - if replace_flag and not mess_flag: - _self.wizard() - if (ll>0) and (view): -- if list[0]!=None: -- _self.set_view(list[0],animate,quiet,hand) -+ if scene_list[0]!=None: -+ _self.set_view(scene_list[0],animate,quiet,hand) - if not quiet and _feedback(fb_module.scene,fb_mask.actions,_self): # redundant - print " scene: \"%s\" recalled."%key - elif (action=='store') or (action=='update'): -@@ -1535,11 +1537,11 @@ - if not pymol._scene_dict.has_key(key): - pymol._scene_dict_sc.append(key) - else: # get rid of existing one (if exists) -- list = pymol._scene_dict[key] -- if (action=='update') and (message==None) and len(list)>5: -+ scene_list = pymol._scene_dict[key] -+ if (action=='update') and (message==None) and len(scene_list)>5: - message = pymol._scene_dict[key][5] -- if len(list)>3: -- colorection = list[3] -+ if len(scene_list)>3: -+ colorection = scene_list[3] - if colorection!=None: - _self.del_colorection(colorection,key) # important -- free RAM - name = "_scene_"+key+"_*" -@@ -1575,9 +1577,9 @@ - key = setting.get("scene_current_name",_self=_self) - key = pymol._scene_dict_sc.auto_err(key,'scene') - if pymol._scene_dict.has_key(key): -- list = pymol._scene_dict[key] -- if len(list)>3: -- colorection = list[3] -+ scene_list = pymol._scene_dict[key] -+ if len(scene_list)>3: -+ colorection = scene_list[3] - if colorection!=None: - _self.del_colorection(colorection,key) # important -- free RAM - lst = _scene_validate_list(_self) -@@ -2573,7 +2575,7 @@ - v = e_it.next() - if v is None: - return False -- v = (float(v) - minimum) / val_range * (n_colors - 1) -+ v = min(1.0, max(0.0, (float(v) - minimum) / val_range)) * (n_colors - 1) - i = min(int(v), n_colors - 2) - p = v - i - rgb = [int(255 * (col_tuples[i+1][j] * p + col_tuples[i][j] * (1.0 - p))) -Index: pymol/modules/pymol/checking.py -=================================================================== ---- pymol/modules/pymol/checking.py (revision 4030) -+++ pymol/modules/pymol/checking.py (revision 4031) -@@ -1,6 +1,9 @@ - - import types --import cmd -+try: -+ import cmd -+except: -+ cmd = None - - def _raising(code=-1,_self=cmd): - # WARNING: internal routine, subject to change -Index: pymol/modules/pymol/shortcut.py -=================================================================== ---- pymol/modules/pymol/shortcut.py (revision 4030) -+++ pymol/modules/pymol/shortcut.py (revision 4031) -@@ -15,7 +15,10 @@ - if __name__=='pymol.shortcut' or __name__=='shortcut': - - import copy -- from pymol.checking import is_string, is_list -+ try: -+ from pymol.checking import is_string, is_list -+ except: -+ from checking import is_string, is_list - - def mkabbr(a, m=1): - b = a.split('_') -Index: pymol/modules/pymol/editing.py -=================================================================== ---- pymol/modules/pymol/editing.py (revision 4030) -+++ pymol/modules/pymol/editing.py (revision 4031) -@@ -400,13 +400,15 @@ - if _self._raising(r,_self): raise pymol.CmdException - return r - -- def push_undo(selection, state=0, _self=cmd): -+ def push_undo(selection, just_coordinates=1, finish_undo=0, add_objects=0, delete_objects=0, state=0, _self=cmd): - ''' - DESCRIPTION - - "push_undo" stores the current conformations of objects in the - selection onto their individual undo rings. - -+ Notice: This command is only partly implemented in open-source PyMOL. -+ - USAGE - - push_undo (all) -Index: pymol/modules/pmg_tk/skins/normal/__init__.py -=================================================================== ---- pymol/modules/pmg_tk/skins/normal/__init__.py (revision 4030) -+++ pymol/modules/pmg_tk/skins/normal/__init__.py (revision 4031) -@@ -106,19 +106,6 @@ - self.app.destroycomponent('commandframe') - - def createMessageBar(self): -- # Create the message bar area for help and status messages. --# frame = self.app.createcomponent('bottomtray', (), None, --# Frame,(self.app._hull,), relief=SUNKEN) --# self.__messageBar = self.app.createcomponent('messagebar', --# (), None, --# Pmw.MessageBar, --# (frame,), --# #entry_width = 40, --# entry_relief=SUNKEN, --# entry_bd=1, --# labelpos=None) --# self.__messageBar.pack(side=LEFT, expand=NO, fill=X) -- - self.messageBar = Pmw.MessageBar(self.commandFrame, entry_width = 25, - entry_relief='sunken', entry_borderwidth=1) #, labelpos = 'w') - -@@ -139,7 +126,6 @@ - self.balloon.configure(statuscommand = self.messageBar.helpmessage) - - def destroyMessageBar(self): -- - self.messageBar.destroy() - - def get_current_session_file(self): -@@ -465,27 +451,6 @@ - self.entry.bind('<Home>',lambda e,s=self: s.cmd.do("cmd._special(106,0,0)")) - self.entry.bind('<End>',lambda e,s=self: s.cmd.do("cmd._special(107,0,0)")) - --# obviated by changes made to the X11 OpenGL Window --# if sys.platform=='darwin': --# if self.app.pymol.invocation.options.external_gui==3: # PyMOLX11Hybrid focus kludge --# self.root.bind_all('<Leave>',lambda e,s=self: s.focus_out(e)) --# self.root.bind_all('<Enter>',lambda e,s=self: s.focus_in(e)) -- --# def focus_in(self,event): # PyMOLX11Hybrid focus kludge --# if self.refocus_entry: --# self.cmd.do("_ cmd.window('defocus')") # deactivate MacPyMOL OpenGL window --# self.refocus_entry = 0 --# self.entry.focus_set() -- --# def focus_out(self,event): # PyMOLX11Hybrid focus kludge --# # necessary so that the OpenGL portion of --# # PyMOLX11Hybrid can exhibit click-through behavior --# if id(event.widget) == id(self.root): --# if ((event.y>event.widget.winfo_height())): --# self.root.focus_set() # (return cursor to entry window) --# self.cmd.do("_ cmd.window('focus')") # activate MacPyMOL OpenGL window --# self.refocus_entry = 1 -- - def update_feedback(self): - if self.focus_entry: - self.focus_entry=0 -@@ -981,18 +946,16 @@ - self.cmd.save(sfile,quiet=0) - - def file_save_mpeg(self): -- ok = 1 - try: - from freemol import mpeg_encode - if not mpeg_encode.validate(): -- ok = 0 - print "produce-error: Unable to validate freemol.mpeg_encode" -+ raise - except: -- ok = 0 -- pass -- if not ok: - tkMessageBox.showerror("Error", - "MPEG encoder missing.\nThe FreeMOL add-ons may not be installed.") -+ return -+ - else: - sfile = asksaveasfilename(defaultextension = _def_ext(".mpg"), - initialdir = self.initialdir, diff --git a/sci-chemistry/pymol/files/pymol-1.6.0.0-stereo.patch b/sci-chemistry/pymol/files/pymol-1.6.0.0-stereo.patch deleted file mode 100644 index 6d0f2e16833d..000000000000 --- a/sci-chemistry/pymol/files/pymol-1.6.0.0-stereo.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 4920977eeeebdc944a824e2c589272324ea5e74e Mon Sep 17 00:00:00 2001 -From: speleo3 <speleo3@21428953-86e3-433d-9a34-2224224d0fc8> -Date: Mon, 15 Jul 2013 14:01:10 +0000 -Subject: [PATCH] fixed flickering ortho problems on some machines - -git-svn-id: svn://svn.code.sf.net/p/pymol/code/trunk@4034 21428953-86e3-433d-9a34-2224224d0fc8 ---- - pymol/ChangeLog | 4 ++++ - pymol/layer1/Ortho.c | 26 ++++++++++++++++++++------ - 2 files changed, 24 insertions(+), 6 deletions(-) - -diff --git a/pymol/layer1/Ortho.c b/pymol/layer1/Ortho.c -index 4d79114..9dd5d45 100644 ---- a/pymol/layer1/Ortho.c -+++ b/pymol/layer1/Ortho.c -@@ -1517,7 +1517,7 @@ void OrthoDoDraw(PyMOLGlobals * G, int render_mode) - int overlay, text; - int rightSceneMargin; - int internal_feedback; -- int times = 1; -+ int times = 1, origtimes = 0; - int double_pump = false; - float *bg_color; - int skip_prompt = 0; -@@ -1627,6 +1627,7 @@ void OrthoDoDraw(PyMOLGlobals * G, int render_mode) - - SceneGLClearColor(0.0, 0.0, 0.0, 1.0); - -+ origtimes = times; - while(times--) { - - switch (times) { -@@ -1678,7 +1679,7 @@ void OrthoDoDraw(PyMOLGlobals * G, int render_mode) - } else { - OrthoRenderCGO(G); - OrthoPopMatrix(G); -- return; -+ continue; - } - } - } -@@ -1925,10 +1926,23 @@ void OrthoDoDraw(PyMOLGlobals * G, int render_mode) - CGOStop(I->orthoCGO); - I->orthoCGO->use_shader = true; - } -- -- OrthoPushMatrix(G); -- OrthoRenderCGO(G); -- OrthoPopMatrix(G); -+ -+ while(origtimes--){ -+ switch (origtimes){ -+ case 1: -+ OrthoDrawBuffer(G, GL_BACK_LEFT); -+ break; -+ case 0: -+ if(double_pump) { -+ OrthoDrawBuffer(G, GL_BACK_RIGHT); -+ } else -+ OrthoDrawBuffer(G, GL_BACK); -+ break; -+ } -+ OrthoPushMatrix(G); -+ OrthoRenderCGO(G); -+ OrthoPopMatrix(G); -+ } - } - } - --- -1.8.3.2 - diff --git a/sci-chemistry/pymol/files/pymol-1.7.0.4-fix-broken-label-scaling-on-Linux.patch b/sci-chemistry/pymol/files/pymol-1.7.0.4-fix-broken-label-scaling-on-Linux.patch deleted file mode 100644 index 359a3bc9c78c..000000000000 --- a/sci-chemistry/pymol/files/pymol-1.7.0.4-fix-broken-label-scaling-on-Linux.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 5c744d0dcf3ae717ce774e07e24812a543f4a866 Mon Sep 17 00:00:00 2001 -From: speleo3 <speleo3@21428953-86e3-433d-9a34-2224224d0fc8> -Date: Mon, 10 Mar 2014 15:50:16 +0000 -Subject: [PATCH] fix broken label scaling on Linux - -- label scaling became distorted on window resizing -- minor readability update in label.vs (no change) - - -git-svn-id: svn://svn.code.sf.net/p/pymol/code/trunk@4069 21428953-86e3-433d-9a34-2224224d0fc8 ---- - pymol/data/shaders/label.vs | 17 ++++++++--------- - pymol/layer1/Scene.c | 10 ---------- - 2 files changed, 8 insertions(+), 19 deletions(-) - -diff --git a/pymol/data/shaders/label.vs b/pymol/data/shaders/label.vs -index b179530..58d9dad 100644 ---- a/pymol/data/shaders/label.vs -+++ b/pymol/data/shaders/label.vs -@@ -21,16 +21,15 @@ uniform float fog_enabled; // actually bool - - void main() - { -- vec4 transformedPosition = gl_ModelViewProjectionMatrix * attr_worldpos; -- transformedPosition.xyz = transformedPosition.xyz/transformedPosition.w; -- transformedPosition.w = 1.; -- transformedPosition.xy = transformedPosition.xy + attr_screenworldoffset.xy/(screenSize*screenOriginVertexScale); -- transformedPosition.z = transformedPosition.z + attr_screenworldoffset.z/(screenSize.x*screenOriginVertexScale); -- transformedPosition.x = transformedPosition.x + aspectRatioAdjustment * attr_screenoffset.x * 2./screenSize.x; -- transformedPosition.y = transformedPosition.y + attr_screenoffset.y * 2./screenSize.y; -- gl_Position = transformedPosition; -+ vec4 pos = gl_ModelViewProjectionMatrix * attr_worldpos; -+ pos /= pos.w; -+ pos.xyz += attr_screenworldoffset / (screenSize.xyx * screenOriginVertexScale); -+ pos.xy += attr_screenoffset.xy * 2. / screenSize * vec2(aspectRatioAdjustment, 1.); -+ -+ gl_Position = pos; - textureLookup = attr_texcoords; -- normalizedViewCoordinate = (gl_Position.xyz/gl_Position.w) / 2.0 + 0.5; -+ normalizedViewCoordinate = pos.xyz / 2.0 + 0.5; -+ - if (fog_enabled > 0.5) { - vec3 eye_pos = vec3(gl_ModelViewMatrix * attr_worldpos); - fog = max(0.0, (gl_Fog.end - abs(eye_pos.z)) * gl_Fog.scale); -diff --git a/pymol/layer1/Scene.c b/pymol/layer1/Scene.c -index 639f737..59ee89e 100644 ---- a/pymol/layer1/Scene.c -+++ b/pymol/layer1/Scene.c -@@ -1972,13 +1972,8 @@ void SceneGetImageSize(PyMOLGlobals * G, int *width, int *height) - void SceneGetImageSizeFast(PyMOLGlobals * G, int *width, int *height) - { - register CScene *I = G->Scene; -- if(I->Image) { -- *width = I->Image->width; -- *height = I->Image->height; -- } else { - *width = I->Width; - *height = I->Height; -- } - } - void SceneGetImageSizeFastAdjustForGrid(PyMOLGlobals * G, int *width, int *height){ - register CScene *I = G->Scene; -@@ -1986,13 +1981,8 @@ void SceneGetImageSizeFastAdjustForGrid(PyMOLGlobals * G, int *width, int *heigh - *width = I->grid.cur_viewport_size[0]; - *height = I->grid.cur_viewport_size[1]; - } else { -- if(I->Image) { -- *width = I->Image->width; -- *height = I->Image->height; -- } else { - *width = I->Width; - *height = I->Height; -- } - } - } - --- -1.9.0 - diff --git a/sci-chemistry/pymol/files/pymol-9999-listing.patch b/sci-chemistry/pymol/files/pymol-9999-listing.patch deleted file mode 100644 index 1b4039c560a6..000000000000 --- a/sci-chemistry/pymol/files/pymol-9999-listing.patch +++ /dev/null @@ -1,17 +0,0 @@ - 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 deleted file mode 100644 index ce05e172e6bb..000000000000 --- a/sci-chemistry/pymol/files/pymol-9999-options.patch +++ /dev/null @@ -1,15 +0,0 @@ - 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/metadata.xml b/sci-chemistry/pymol/metadata.xml index 14ad67b8fdda..ace2d8e58ce8 100644 --- a/sci-chemistry/pymol/metadata.xml +++ b/sci-chemistry/pymol/metadata.xml @@ -7,8 +7,6 @@ </maintainer> <use> <flag name="apbs">Install the apbs plugin</flag> - <flag name="numpy">Compile numpy support</flag> - <flag name="vmd">Enable vmd module for trajectories</flag> <flag name="web">Install Pymodule needed for web app support</flag> </use> </pkgmetadata> diff --git a/sci-chemistry/pymol/pymol-1.5.0.3-r1.ebuild b/sci-chemistry/pymol/pymol-1.5.0.3-r1.ebuild deleted file mode 100644 index 1a0e65335a5c..000000000000 --- a/sci-chemistry/pymol/pymol-1.5.0.3-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.5.0.3-r1.ebuild,v 1.13 2015/01/22 08:14:25 pinkbyte Exp $ - -EAPI=4 - -PYTHON_DEPEND="2:2.7" -SUPPORT_PYTHON_ABIS="1" -RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.* *-jython 2.7-pypy-*" -PYTHON_USE_WITH="tk" -PYTHON_MODNAME="${PN} chempy pmg_tk pmg_wx" - -inherit distutils eutils fdo-mime prefix versionator - -DESCRIPTION="A Python-extensible molecular graphics system" -HOMEPAGE="http://www.pymol.org/" -SRC_URI=" - http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz - http://dev.gentoo.org/~jlec/distfiles/${PN}-icons.tar.xz" - -LICENSE="PSF-2.2" -SLOT="0" -KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="apbs numpy vmd web" - -DEPEND=" - dev-python/numpy - dev-python/pmw:0 - 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 - ) - web? ( !dev-python/webpy )" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-1.5.0.1-setup.py.patch \ - "${FILESDIR}"/${PN}-1.5.0.1-data-path.patch \ - "${FILESDIR}"/${PN}-1.5.0.1-flags.patch - - use web || epatch "${FILESDIR}"/${P}-web.patch - - epatch "${FILESDIR}"/${P}-prefix.patch && \ - eprefixify setup.py - - use vmd && epatch "${FILESDIR}"/${PN}-1.5.0.1-vmd.patch - - if use numpy; then - sed \ - -e '/PYMOL_NUMPY/s:^#::g' \ - -i setup.py || die - fi - - rm ./modules/pmg_tk/startup/apbs_tools.py || die - - echo "site_packages = \'$(python_get_sitedir -f)\'" > setup3.py || die - - sed \ - -e "s:/opt/local:${EPREFIX}/usr:g" \ - -e '/ext_comp_args/s:\[.*\]:[]:g' \ - -i setup.py || die - - # python 3.* fix - # sed '452,465d' -i setup.py - distutils_src_prepare -} - -src_configure() { - : -} - -src_install() { - distutils_src_install - - # 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="${EPREFIX}/$(python_get_sitedir -f)/${PN}" - PYMOL_DATA="${EPREFIX}/usr/share/pymol/data" - PYMOL_SCRIPTS="${EPREFIX}/usr/share/pymol/scripts" - EOF - - doenvd "${T}"/20pymol - - cat >> "${T}"/pymol <<- EOF - #!/bin/sh - $(PYTHON -f) -O \${PYMOL_PATH}/__init__.py -q \$* - EOF - - dobin "${T}"/pymol - - insinto /usr/share/pymol - doins -r test data scripts - - insinto /usr/share/pymol/examples - doins -r examples - - dodoc DEVELOPERS README - - doicon "${WORKDIR}"/${PN}.{xpm,png} - make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" -} - -pkg_postinst() { - elog "\t USE=shaders was removed," - elog "please use pymol config settings (~/.pymolrc)" - elog "\t set use_shaders, 1" - elog "in case of crashes, please deactivate this experimental feature by setting" - elog "\t set use_shaders, 0" - elog "\t set sphere_mode, 0" - distutils_pkg_postinst - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} diff --git a/sci-chemistry/pymol/pymol-1.5.0.3-r2.ebuild b/sci-chemistry/pymol/pymol-1.5.0.3-r2.ebuild deleted file mode 100644 index c6a0cf553459..000000000000 --- a/sci-chemistry/pymol/pymol-1.5.0.3-r2.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# 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.5.0.3-r2.ebuild,v 1.5 2014/05/01 12:18:46 jlec Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="tk" - -inherit distutils-r1 fdo-mime prefix versionator - -DESCRIPTION="A Python-extensible molecular graphics system" -HOMEPAGE="http://www.pymol.org/" -SRC_URI=" - http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz - http://dev.gentoo.org/~jlec/distfiles/${PN}-icons.tar.xz" - -LICENSE="PSF-2.2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="apbs numpy vmd web" - -DEPEND=" - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pmw[${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 - ) - web? ( !dev-python/webpy )" -RDEPEND="${DEPEND}" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}"/${PN}-1.5.0.1-setup.py.patch - "${FILESDIR}"/${PN}-1.5.0.1-data-path.patch - "${FILESDIR}"/${PN}-1.5.0.1-flags.patch - "${FILESDIR}"/${P}-prefix.patch - ) - - use web || PATCHES+=( "${FILESDIR}"/${P}-web.patch ) - use vmd && PATCHES+=( "${FILESDIR}"/${PN}-1.5.0.1-vmd.patch ) - - if use numpy; then - sed \ - -e '/PYMOL_NUMPY/s:^#::g' \ - -i setup.py || die - fi - - rm ./modules/pmg_tk/startup/apbs_tools.py || die - - python_export python2_7 EPYTHON PYTHON_SITEDIR - echo "site_packages = \'$(python_get_sitedir)\'" > setup3.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 - - eprefixify setup.py -} - -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 - - cat >> "${T}"/pymol <<- EOF - #!/bin/sh - ${EPYTHON} -O \${PYMOL_PATH}/__init__.py -q \$* - EOF - - dobin "${T}"/pymol - - insinto /usr/share/pymol - doins -r test data scripts - - insinto /usr/share/pymol/examples - doins -r examples - - dodoc DEVELOPERS README - - doicon "${WORKDIR}"/${PN}.{xpm,png} - make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" -} - -pkg_postinst() { - elog "\t USE=shaders was removed," - elog "please use pymol config settings (~/.pymolrc)" - elog "\t set use_shaders, 1" - elog "in case of crashes, please deactivate this experimental feature by setting" - elog "\t set use_shaders, 0" - elog "\t set sphere_mode, 0" - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} diff --git a/sci-chemistry/pymol/pymol-1.6.0.0-r1.ebuild b/sci-chemistry/pymol/pymol-1.6.0.0-r1.ebuild deleted file mode 100644 index 0c21fbfb9a67..000000000000 --- a/sci-chemistry/pymol/pymol-1.6.0.0-r1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# 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.6.0.0-r1.ebuild,v 1.3 2014/05/01 12:18:46 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=" - mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-2)/${PN}-v${PV}.tar.bz2 - http://dev.gentoo.org/~jlec/distfiles/${PN}-icons.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/pmw[${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 - ) - web? ( !dev-python/webpy )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${PN} - -PATCHES=( - "${FILESDIR}"/${P}-labels.patch - "${FILESDIR}"/${P}-bg_rgb.patch - ) - -python_prepare_all() { - distutils-r1_python_prepare_all - sed \ - -e "s:\"/usr:\"${EPREFIX}/usr:g" \ - -e "/ext_comp_args/s:=\[.*\]$:= \[\]: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 -} - -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 - - doicon "${WORKDIR}"/${PN}.{xpm,png} - make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" - - 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 -} diff --git a/sci-chemistry/pymol/pymol-1.6.0.0-r2.ebuild b/sci-chemistry/pymol/pymol-1.6.0.0-r2.ebuild deleted file mode 100644 index 1c14915b82ce..000000000000 --- a/sci-chemistry/pymol/pymol-1.6.0.0-r2.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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.6.0.0-r2.ebuild,v 1.3 2014/05/01 12:18:46 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=" - mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-2)/${PN}-v${PV}.tar.bz2 - http://dev.gentoo.org/~jlec/distfiles/${PN}-icons.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/pmw[${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 - ) - web? ( !dev-python/webpy )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${PN} - -PATCHES=( - "${FILESDIR}"/${P}-labels.patch - "${FILESDIR}"/${P}-bg_rgb.patch - "${FILESDIR}"/${P}-stereo.patch - ) - -python_prepare_all() { - distutils-r1_python_prepare_all - sed \ - -e "s:\"/usr:\"${EPREFIX}/usr:g" \ - -e "/ext_comp_args/s:=\[.*\]$:= \[\]: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 -} - -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 - - doicon "${WORKDIR}"/${PN}.{xpm,png} - make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" - - 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 -} diff --git a/sci-chemistry/pymol/pymol-1.6.0.0.ebuild b/sci-chemistry/pymol/pymol-1.6.0.0.ebuild deleted file mode 100644 index bbc3ac50b0e0..000000000000 --- a/sci-chemistry/pymol/pymol-1.6.0.0.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# 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.6.0.0.ebuild,v 1.3 2014/05/01 12:18:46 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=" - mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-2)/${PN}-v${PV}.tar.bz2 - http://dev.gentoo.org/~jlec/distfiles/${PN}-icons.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/pmw[${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 - ) - web? ( !dev-python/webpy )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}"/${PN} - -python_prepare_all() { - sed \ - -e "s:\"/usr:\"${EPREFIX}/usr:g" \ - -e "/ext_comp_args/s:=\[.*\]$:= \[\]: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 - - doicon "${WORKDIR}"/${PN}.{xpm,png} - make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" - - 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 -} diff --git a/sci-chemistry/pymol/pymol-1.6.0_rc1.ebuild b/sci-chemistry/pymol/pymol-1.6.0_rc1.ebuild deleted file mode 100644 index 7c41c54fc1af..000000000000 --- a/sci-chemistry/pymol/pymol-1.6.0_rc1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# 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.6.0_rc1.ebuild,v 1.3 2014/05/01 12:18:46 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/${P}.tar.xz - http://dev.gentoo.org/~jlec/distfiles/${PN}-icons.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/pmw[${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 - ) - web? ( !dev-python/webpy )" -RDEPEND="${DEPEND}" - -python_prepare_all() { - sed \ - -e "s:\"/usr:\"${EPREFIX}/usr:g" \ - -e "/ext_comp_args/s:=\[.*\]$:= \[\]: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 - - doicon "${WORKDIR}"/${PN}.{xpm,png} - make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" - - 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 -} diff --git a/sci-chemistry/pymol/pymol-1.7.0.0.ebuild b/sci-chemistry/pymol/pymol-1.7.0.0.ebuild deleted file mode 100644 index 73702b3569c6..000000000000 --- a/sci-chemistry/pymol/pymol-1.7.0.0.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# 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.0.0.ebuild,v 1.4 2014/05/01 12:18:46 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=" - mirror://sourceforge/project/${PN}/${PN}/$(get_version_component_range 1-2)/${PN}-v${PV}.tar.bz2 - http://dev.gentoo.org/~jlec/distfiles/${P}.png.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}"/${PN} - -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}"/${P}.png ${PN}.png - make_desktop_entry pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" - - 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 -} diff --git a/sci-chemistry/pymol/pymol-1.7.0.4-r1.ebuild b/sci-chemistry/pymol/pymol-1.7.0.4-r1.ebuild deleted file mode 100644 index 1e13a976cbee..000000000000 --- a/sci-chemistry/pymol/pymol-1.7.0.4-r1.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# 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.0.4-r1.ebuild,v 1.2 2014/05/01 12:18:46 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 - -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}"/${P}-fix-broken-label-scaling-on-Linux.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 pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" - - 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 -} diff --git a/sci-chemistry/pymol/pymol-1.7.0.4.ebuild b/sci-chemistry/pymol/pymol-1.7.0.4.ebuild deleted file mode 100644 index fb556c9d126a..000000000000 --- a/sci-chemistry/pymol/pymol-1.7.0.4.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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.0.4.ebuild,v 1.2 2014/05/01 12:18:46 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 - -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} - -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 pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" - - 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 -} diff --git a/sci-chemistry/pymol/pymol-1.7.1.1.ebuild b/sci-chemistry/pymol/pymol-1.7.1.1.ebuild deleted file mode 100644 index f1b65e9caca3..000000000000 --- a/sci-chemistry/pymol/pymol-1.7.1.1.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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.1.1.ebuild,v 1.2 2014/05/01 12:18:46 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 - -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} - -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 pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" - - 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 -} diff --git a/sci-chemistry/pymol/pymol-1.7.1.3.ebuild b/sci-chemistry/pymol/pymol-1.7.1.3.ebuild deleted file mode 100644 index d12102f74631..000000000000 --- a/sci-chemistry/pymol/pymol-1.7.1.3.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# 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.1.3.ebuild,v 1.1 2014/05/14 14:02:17 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 - -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} - -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 pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" - - 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 -} diff --git a/sci-chemistry/pymol/pymol-1.7.2.0.ebuild b/sci-chemistry/pymol/pymol-1.7.2.0.ebuild deleted file mode 100644 index 8ef573dcd0b5..000000000000 --- a/sci-chemistry/pymol/pymol-1.7.2.0.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# 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.2.0.ebuild,v 1.1 2014/08/11 07:27:00 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} - -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 pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" - - 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 -} diff --git a/sci-chemistry/pymol/pymol-1.7.2.1.ebuild b/sci-chemistry/pymol/pymol-1.7.2.1.ebuild deleted file mode 100644 index 800087c73243..000000000000 --- a/sci-chemistry/pymol/pymol-1.7.2.1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# 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.2.1.ebuild,v 1.1 2014/08/21 07:25:44 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} - -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 pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" - - 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 -} diff --git a/sci-chemistry/pymol/pymol-1.7.3.0.ebuild b/sci-chemistry/pymol/pymol-1.7.3.0.ebuild deleted file mode 100644 index 9bb025baf671..000000000000 --- a/sci-chemistry/pymol/pymol-1.7.3.0.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# 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.0.ebuild,v 1.1 2014/09/15 08:20:08 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} - -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 pymol PyMol ${PN} "Graphics;Education;Science;Chemistry" "MimeType=chemical/x-pdb;" - - 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 -} diff --git a/sci-chemistry/pymol/pymol-1.7.3.1.ebuild b/sci-chemistry/pymol/pymol-1.7.3.1.ebuild deleted file mode 100644 index 37b77d5f35be..000000000000 --- a/sci-chemistry/pymol/pymol-1.7.3.1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# 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.1.ebuild,v 1.1 2014/10/17 06:54:03 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}"/${P}-maeffplugin.cpp.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 -} diff --git a/sci-chemistry/pymol/pymol-1.7.3.2.ebuild b/sci-chemistry/pymol/pymol-1.7.3.2.ebuild deleted file mode 100644 index 69c5657b858b..000000000000 --- a/sci-chemistry/pymol/pymol-1.7.3.2.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# 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.2 2014/10/27 17:18:52 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[${PYTHON_USEDEP}] - sci-chemistry/pdb2pqr[${PYTHON_USEDEP}] - 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 -} diff --git a/sci-chemistry/pymol/pymol-1.7.3.4.ebuild b/sci-chemistry/pymol/pymol-1.7.3.4.ebuild deleted file mode 100644 index 47092b2f997d..000000000000 --- a/sci-chemistry/pymol/pymol-1.7.3.4.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# 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.4.ebuild,v 1.1 2014/11/21 08:57:47 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[${PYTHON_USEDEP}] - sci-chemistry/pdb2pqr[${PYTHON_USEDEP}] - 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 - ) - -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 -} |