sci-chemistry/ccpn: Todays python patches; drop old

Package-Manager: portage-2.2.13/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

10 files changed, 28 insertions, 1194 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 8c3bb83ca3e2..1be1ff6c6c52 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-chemistry/ccpn
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.145 2014/09/15 11:55:15 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.146 2014/09/17 10:29:14 jlec Exp $
+
+*ccpn-2.4.0_p140917 (17 Sep 2014)
+
+  17 Sep 2014; Justin Lecher <jlec@gentoo.org> -ccpn-2.4.0_p140425.ebuild,
+  -ccpn-2.4.0_p140425-r1.ebuild, -ccpn-2.4.0_p140513.ebuild,
+  -ccpn-2.4.0_p140526.ebuild, -ccpn-2.4.0_p140605.ebuild,
+  -ccpn-2.4.0_p140614.ebuild, -ccpn-2.4.0_p140707.ebuild,
+  -ccpn-2.4.0_p140812.ebuild, +ccpn-2.4.0_p140917.ebuild:
+  Todays python patches; drop old
 
 *ccpn-2.4.0_p140915 (15 Sep 2014)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index 72e449250d9e..f475c5c6941b 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -21,42 +21,29 @@ AUX xeasy2azara 324 SHA256 89945dae1c7bd78aefdd19c81c79571a13aaa149d6c50e12cc0ec
 DIST analysis2.3.1r2.tar.gz 21683215 SHA256 a9e47a24d84f7b8261c6c23a8607af5a6ba2f2db9e161a7f873794c1ba8663ef SHA512 96bf75d1e958340d83836348f5a3045e5b2632913c66d9d74272140085800ea096f1ae53eadfb5bc0eba76804f1864553e82a517d637bdc3bace71b0c1c785ee WHIRLPOOL 2d1e55a4d8e62decc649a885d767dc5a2bdec701447a97ef8bc5e15ddde8c6add5fb0606c0cdd5871bbb9af74c163a13a28207b3e254fb41ba56293c88d6bc85
 DIST analysis2.4.0.tar.gz 36047222 SHA256 efde9f398bb62cb79e32cfe3118fe2af4ff6c56e5a9068bee654b3aa00f20ae1 SHA512 2f9c5abd401675796d64c620f6142b484084c54af98e0a4800b2bea81de447d711d594ccf773f86ef6631f0482fe0a0ad2881da713d6e022e0704f8dea8d65d9 WHIRLPOOL 922aaf0b464966d91286e1e96757cdf66238373f5c358623657f552012473cea4196622274dbbc8455b60df3580132497c6e9de2f3d9c2f539fb4ad8684dbf96
 DIST ccpn-update-2.3.1-140425.patch.xz 19020 SHA256 38cc7100d46966cb07fbb8c032248064191da3e015de4332878e8992f6acc9e6 SHA512 071e1a0c4f589a76a6878cb5636516304c3eb9d929924ed1d03c1838cb1d894cc330cc5c6c0b222a71e24513e212f469a69fc3e746ea82e34eb669292d7ce52e WHIRLPOOL 72d6850734e0e4f64fb63b1790ecd942b03b03c3e4682c1bc6248b3ee1f12bf014534a2f37ca31914b4a1be87ad8ef8a160364aa5dd0e1b3e5bfe47f3a83b8f3
-DIST ccpn-update-2.4.0-140425.patch.xz 1096 SHA256 ea1325b4b4ce6e03f004686f0b75243c0b354c72b7431f3611c59f8b288afd8d SHA512 8c1d3df4210f02e8fbb07caabab740c115769457296ae62903f5401ca875b006e355b99dcda32f9606c93c84b0e0cee07acff53fc953bc77918597b58f826e0f WHIRLPOOL 594ed27fc74ef56473af76de164a2c3e30f63ffd677ebcd17d3c36f724961afbb2952212a1140cd1aaf7ba6bd5d9ba960c70ec95808f97a5b94a641b51cc8653
-DIST ccpn-update-2.4.0-140513.patch.xz 4112 SHA256 fbee8e6fc4c2b8617027050ff02eee5ef37a8608b5f8ee36f692100018f69f24 SHA512 ae6c659e65612eba1ec23740a6d8e504ab1fc3404899a10eeca98bfed8b691037116029dba6a02f83ff90a45d782dd0b629f2b933b8bd264d52ded460475b14d WHIRLPOOL 8a0c7ddf84a035bb92f8c9c058ca34b18815f298ad15f2da6c781e954b7d3d53f46166f09541ca89b7dd90fdf99d4a717384bb06be19f39bd5d610e1ecc64689
-DIST ccpn-update-2.4.0-140526.patch.xz 4960 SHA256 0de68fa0492a87d2aac381d6630575b863a349414118b775f52f63c11553ee94 SHA512 6f8146d6a86319c3771571c9af010d1155ea3a8033716889b006cd2a8f004d75a455254a70bda5aee4f43790b498014b25311806f6e7663d0f1c9f924a909791 WHIRLPOOL 9241d6e8f1651eb87bcf951594ae21fa9e528c9185308ada9c3030577769e93ee35df0193df4e385910e34915eab522b7a3d176f73af45cc0c3aab3fefc448c2
-DIST ccpn-update-2.4.0-140605.patch.xz 5712 SHA256 5b8b6c0d1adf2af0115735a714502f1279d902d03be758a2f3d787a8bc92deeb SHA512 20bf8c9186a532c74d9253329a0604ec6a86f87e7ee84bea22cf38b8a29b10312c82cdc24820d76c64cd3d7c7d221e84421846895b9e3eb40e3b9a8d0c363d95 WHIRLPOOL 7e2be8bf5f84d53ab705c2c1b2c689a7bf3d478979fd4d4c09ad5ba2e8663937cf14ae410ded90b505c7b7bf7bff8689bf009d7235d17d2ff8e11632fa5bf2ca
-DIST ccpn-update-2.4.0-140614.patch.xz 6628 SHA256 7775cb0c552566808d0fcbe5eefbf5bd4f321358e9420d99973baf68388e12e9 SHA512 320c2174f961bf423fd1c2e83be54757aab3a60b5e2fd72e66aa5a128e3373ee06ca17667f94e8f3c82971ec3a3dd4dd4d66c67cd634900dd9bf0645e702fd79 WHIRLPOOL e24b48372595a8502abd51f11ae5f8a1c35a4d27d539b404c9b5384271d1368ee33dcba840495fd3a57017b63c865aaebb37bd1dbec1ef510041596d0872ce62
-DIST ccpn-update-2.4.0-140707.patch.xz 7200 SHA256 e5e1e7c3e0e1399684f15410b80c56c876031ba634a40a12088090b45802ff2d SHA512 ad96137f961d357f4be1d77bd6459dfcd2a2874706c29f122eb56c65d14c7000926499dec53bc587230d685198182dace537763c9fc05f3eaf8bd427cd5a8e1b WHIRLPOOL 29771118ac135159ccd5440268f7548fcc9057d4f8c494d860b991af4b024ebe391dc083c100911bf49d028d2e26cfaa5c7ac6aea4969d91be5050bc5d4ac301
-DIST ccpn-update-2.4.0-140812.patch.xz 9548 SHA256 3293db9e68c302d3386598da4c0274427254a07bf70c6da1967b35300e8ec84b SHA512 51bf51463486c4b079e2c04471203cfca8b046409cc404c9a885517afd29348dbf359348c579e21048af42020d4f04ce13cdb346d0d93863eac6f668f1c9a5a3 WHIRLPOOL c1dd2393975b95c65b6afc04014882329049689f309bacc70db269c1c4f18d83d0e7aeda739f57b5df0c4b0e51225314f93e8d73a1eefb4c27bd645c75d83bda
 DIST ccpn-update-2.4.0-140915.patch.xz 11956 SHA256 bce6fe96adf75aafe5d902fd1e5a598cb1e7073f3dc6eb667489beb7095d3bd2 SHA512 76e8a46c98d4e8d93bdbadbecfcd7cec4f7e6ce2b2e1fff7334e6bfdefa33ddf8755f8f00c5abb114438cf3ebc1598c15dca6f8c2cafd86a9a6dcd65746ad23d WHIRLPOOL 22d9a79aae70de1b14962d1c1a958204dfcaa9a33a0020d5c1a012478b4f4d2ed9f7f0b3ca4f963c0ebce5de1a798d6ad7c3057faf4a3b167f7bbe52e05fdb04
+DIST ccpn-update-2.4.0-140917.patch.xz 12092 SHA256 24d872303bf2ef0ce8fcdca4bc1cf63c7b9036ccd8b46813cfc8b1766482b737 SHA512 5c6dec8253358e6a12adb1473e99b88202c7cce2952ac8d5e9e2ee56df3a83a69ef7d8b3d28244462386aa2a5c7537c084a04b0366de9c5225ba7de29d17e950 WHIRLPOOL ae07cae5d7be20460709a24b4ac6bb50debd1eee1a70b03e98e94f2038122bc7b723ba81ea0377a1fc7e995f3e00d036a3dc91b417e38f42b766deed001e4c4c
 EBUILD ccpn-2.3.1_p140425.ebuild 4703 SHA256 8bdc74da4c23ab1c25147abd87ef87a8567bdf21a15a511d1ee966f09ef2c6c3 SHA512 a22af894d808cb5ca19190fb9dfdfe21e47b3626e2b18eebc1946fca28bbd463fb1bd4fca0a2b2ff57558ec2f004798c58253ccc7740f18174df258d07499ef8 WHIRLPOOL abc9ac85b431e2acc5ec8bf760ff52ae77c60df8e72dab823cb83c0040f895b6234b28b7e63ca854422bd311cf17079cacf03e702d3cc6e5907bcd13080b2208
-EBUILD ccpn-2.4.0_p140425-r1.ebuild 4731 SHA256 82ce5d2b9fefeeca1941091b1bae47516ce74b0c472043140d1d9ae5b9e706a6 SHA512 2c9a09894c25f6c74c98db4fa69cf2c37695e10ab3fa91812e2912610f2e2d87d856b7864790832f9ff25e27cb4a2cbfa02f8cf5695c06ccb3d93def042090e6 WHIRLPOOL f1af39c0e5df8d6a301fa17371b045cab9a6dc261973315d3584bd748044fec8edd0199f2d4c07932efaec3328a211708a906281cb7d85f92e5e64bcd21216c9
-EBUILD ccpn-2.4.0_p140425.ebuild 4698 SHA256 b5e2d0fdf255ad588edba56e00aa41e75d24f8f5eb94e9cc20fbf7523ae45ff7 SHA512 ad5c1563d2565634b4add451c581c3cd2790850ab4d2c20d51cd07d0844c725685c5996fef4c5ae06c1cdd16062c853a6ac47eb244a454cc3305c3a78417a93c WHIRLPOOL 1586cc2c05fd004bbe0f9264bbb49568a2eb1e342da44a996cb7aa835cf9040401c2a5226275a1249d13a87a2c05924ca65792309120c1c57066b7724ce5ca99
-EBUILD ccpn-2.4.0_p140513.ebuild 4698 SHA256 579e5a0bab5561da630033be60f5b70cb651b46e3882c0e6f3f016efb2e4ad2a SHA512 56d7c8b64c9b549a48a611df76132235b60d794b7c97be8a5a4a8ecde90577d551a618bc10ad2f88c1778c0f5adefcad3813e88e414a83e4b1cc9663dd1b1f34 WHIRLPOOL 4dda434a2b225fbca03ba82fec0ac19559e174dcefc7815750df28d17cdb76222d5fb7bbcdce82df9b45c98dee24a9ef865538410652c994e6029e615ccd5aac
-EBUILD ccpn-2.4.0_p140526.ebuild 4698 SHA256 911532c276294dd31aee4c246ca6b0c9e7d5cb900ace5e60a8cb8fbf1d61ef3d SHA512 f03b4fc9414396856136115fe6a8fa50e777ed01b96761e81115d5bbe295ac6845fb14b5c4cb48b51562d658c06124c747eae9ee55266e1ca70c9225496af5cd WHIRLPOOL 8ea6aec1c97a780ac540cf05305041130b9fc72173534a64e43826d49d32a08a1485281506ad0d4afdde1c4bbfbf2734cb26e9fd91f35d91768afb37fe5421d9
-EBUILD ccpn-2.4.0_p140605.ebuild 4698 SHA256 9f437e27eec31b215326c1671ceb1988b7e752e31d462eb19ff0f673d4b2b4b8 SHA512 c5343f975e99b4c395b106c64abc24b3abe94d413bee2a7511ef94b487649d9254e2eebd877aeab13470016e2f44ddfa84183744834d3b2ce858871b9b5f3a99 WHIRLPOOL 0036ff06e70d79d9eb4951386c35e905b71f1bdd9b712d6337944b4b45da00619cdaea5931d727ef9e9f29001d0e884694a26d762377f6929396fa9d17baf7bd
-EBUILD ccpn-2.4.0_p140614.ebuild 4692 SHA256 4491c66d8fa7d477b409d7c984120b01c5823cf2d28a35dcfcbd8751271688a7 SHA512 03f5e790d78373b57dc0bdb8dded8cf376d4663140803143efb178e02d4cd5c93001b633cb43b11be541e08060d0c8fb2ebece9daad69d37d3cd622c31c9d620 WHIRLPOOL 5316f5310e45b6241ea46704372740695d763c03e86390f1c6fd68b89caa56b5efe8f88317776bb6e0895a85f6f5bb172a6b4312f310c7cef8aea293b7a93d82
-EBUILD ccpn-2.4.0_p140707.ebuild 4692 SHA256 66fabf46c6f1ee374886422e66cb11c43a8d08c5f1425ae42c6b6a2beb917fc6 SHA512 b4334be0ceecad999e7f792a84760970ad900870783dad413f708bfed6355b1631c507503b0eb4c75d3136850bc75afa4894da90eb0dc0ca99dfefdb2d4e2a07 WHIRLPOOL 65b260fa675c8230faa62192f2246775ba78e232d481a8b347d44054ed34e2208be519592b1422b1fe7a3b1de8e2a0d68a7bacc6ddfebf81a0edb08d345e0f6d
-EBUILD ccpn-2.4.0_p140812.ebuild 4692 SHA256 de194baa937a47a04d1d70fbfc23c6133bc8653aca93f99cc781a0f8acfd0a2e SHA512 07aaf75d010ec11513de2614ee74dca616cdd015d1378d189542abc19793f5fc91ffa00b73d007d3856622d3da116db424d56fe7fbd45395c1a8a62f987918f7 WHIRLPOOL 08b649f7ce2a6f5d437a268c8e029d02890aea72e1d38c6da6ab45f0232ab5ac2b91dcc568ec8f92481b3be34b60e256ed3176fa582c9261db8d02ba9318e3c2
 EBUILD ccpn-2.4.0_p140915.ebuild 4692 SHA256 32847b9452cab2d8579eb372548812497425f25715f4597a9c967abdf8ccf687 SHA512 67b2c0c969cf83194435667dfb92719d8b75be049cafa708c124e91a60519ae8b43843278004ecac92dc1035cd8391cd8531f58b82cf1fffe5151d0a4595b340 WHIRLPOOL e5de10a8838cfee05a23e81f1f3f032e23263633b67504afe71ae5a7d06a4097eba4ec32714907380ce17d82619fb8db9e0217b16952e19f0babe19dd3e30c79
-MISC ChangeLog 27622 SHA256 ee945e9cac5797cea7b59fb83fba619671ac6bf46f33c0445c3f7ce9bcb805ed SHA512 b42a6b73f23e9ae6f8c723172a72339f56db66a65640483338482d973c20ed3ada7a009c09b717c08e817db295c3a54706bbf15f68002af5fe4f247868a6a85f WHIRLPOOL 080448b492c97336e1962969ea52ae383910abb2a45667652f1ff3af59f70307525267a9fd60e31ae54860bebe916909a38e7de07c1e6e5350d589a259511a65
+EBUILD ccpn-2.4.0_p140917.ebuild 4692 SHA256 9f4acfd7e56f6f0ccd12037b91bbd7e739e932e4543b8f34214273c0d2954012 SHA512 a7abfe87f100596d9f1c1bb22c43f35833a7f256c153fe2e52d2be4570eecb82b641081b35fd62478800a579ce4a5eb84f917095cd6172665b1d3e6c6db117ec WHIRLPOOL f0bc39c7ffd2b4b74919eec8d4b5bb619c3b45d1fc19f6cc5de6ca762b13189e5067e0e397f0ffe2e13e46ddfa6d18df78e8ef2def28426bdeab479bd9aee075
+MISC ChangeLog 28002 SHA256 0240876e185c066e04a8ec068e79017b78ffcef39a469eea7d3dc450d2ae7bfa SHA512 b5c3ce1d1f6485b3fe82771a52bc457991370d7408a47c9efa27c8006f256ad184b44af5dd134918fa42f6d7cd67257f9ac8b20411764fb07ff52411cf7fc54b WHIRLPOOL 847b77aac1d9e137a05e6f209d75883b9e503b54a2f63e276684eb501228a27184dd6232aab5722eba4f358c0aa8ab33138cbf4a96ffcbdb2aba219f67e15374
 MISC metadata.xml 234 SHA256 8297e76ecd2cb828f604e9f138b263179eb84beb640215a0f60d7613eb46bb7f SHA512 0e94c0e6570a9267a39968d81c3b80680ccbc6eebb62199e4830b021a114c94a0de17ef2103cef62b7e27da1f51f225a30abb802aff82140ae6dc43366113d31 WHIRLPOOL fa6d4d90b092953b88ed3ad03e1e8c189296d268b39d13a4b4dcb78f0c4456341e3f1b44eea0860054fee43079179cb7cf7a912acf1fbe693ecdca6d9a65f081
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUFtOLXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUGWJ7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirRDAP/3cNOdiHbBcQqg8AaCqLGAYo
-Wga3JIpVJYYMCxTHVB3+p8HSRipTCP3Lm0dZa65AxnhMRRmwf49huiflq6ry4RKr
-1KCrZ509JFAYTI/WK/kTfM+4x0jJ+7D2d7GSeQ7HHxeaZqPNDCxZp/UY7wfp1bnl
-o/Enq3el+pz0I2LROGo/6OPM8qudxIocFQFAR5z7TLnda36aN98d6dd6xhi1+NZ7
-koz2DYUhHueMjai1KDPYhsqykzND/UfOohadzFW4Qjw7gKdDl+nYY5tSfPUct1wm
-STWLRusdGcHaWAaSsD37hKKEKPWkXF6eTl6zZl+opSS/VSyffwKkcIPOfQScu8CN
-WhbXHW4+lCW4k/43fvYH2G9Kn7aQvEfwoLNTl1C/3acF4O2AbKACiO+yz5Lm/qVu
-FtAmKsew8u8pFIB7Y1jL9JMPL00wEGKlFUdgN6I1/wuNxWfkDU+f3Jy+0sJJODyA
-cY2WnCtYE2gxrKPgNSqR7WM4sKogYFJ9AFxK8wk/4JGrNFvX5E2oNxLcRkiTceSn
-kAWIFt8AEfC5rv5AA2/2phLMOT+bYdZ4r7ko0r4636e1pYgRvc2JrE0zI3BCeLrr
-o7cbUkihQaHW5RS7HIDvK7FUIMnt0CKu5T/4+cwSnVmVbC33LimFnTOYKilmGPGi
-BlBoLLQg8cc8FsUqukBR
-=NoWQ
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVircC0P/0wn+ZNI67jEqpjecDWjJwLx
+x8B2zH4XOpQ+oibfHT2DGRGVrkF8CpK4mRsGCuq4ZxduGCvz1fJsjwi4SxovkvxK
+qIkzYg795Xz5PNWguNxO1k/FaLPNRKhice4TfZfKwAZnA8IT9Ydn8BVKEOX/fApf
+7GYEoNH0gSbFxguGKh6aQW4C3Gla/39cU6vB9HeKt9fakbqrWxAhjnrOzOSnSZsj
+pbBa+HYupK8TchQFdSVbZggyHth0R7Q7jUVg4DtD5EBMIHw/F+nPdFO+MbBzWLQc
+Ejpkwx3KA72+puF4dqxG0SJXx7ew0wsJNXXoF2QAcqwjmV+eEdjQVo9O9lcT0Vhd
+rCelysHL2dY34uJ9FbGSPcC//hJhvvn/ppnWlZ+26ZrqkasXWoTmDDcWFsMcM+Cn
+/gAkBMnqAoOxcL6+6KjDzSgMuPG+Bvh8Emd3ny3UlijrGJ7vortCZohKGxBqogd6
+rvjHQ1XESpFZJ3Ib+mpGpOJO7uDRgYGfKRO+0axL4T/ccXva86+wVUycH4/R1dJ5
+vVELjbJ6LNsyOJ9mOYv9wHFixiXUo6Dk076Y51rKGAT634/RBbPWRHRsD/hepakw
+rSfze6BXMMT/RVqc2M/8gN1yItrxlVmAQvuH8UKYg14ww4jQXynIJcq2eYL4sHvV
++APh/0sf4B46E+EQyBwb
+=0FR8
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.4.0_p140425-r1.ebuild b/sci-chemistry/ccpn/ccpn-2.4.0_p140425-r1.ebuild
deleted file mode 100644
index 2ba72f48e672..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.0_p140425-r1.ebuild
+++ /dev/null
@@ -1,166 +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/ccpn/ccpn-2.4.0_p140425-r1.ebuild,v 1.1 2014/04/28 16:39:07 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch "${FILESDIR}"/${P}-lxml.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.0_p140425.ebuild b/sci-chemistry/ccpn/ccpn-2.4.0_p140425.ebuild
deleted file mode 100644
index f61cf8b57c94..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.0_p140425.ebuild
+++ /dev/null
@@ -1,166 +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/ccpn/ccpn-2.4.0_p140425.ebuild,v 1.1 2014/04/25 14:31:14 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.0_p140513.ebuild b/sci-chemistry/ccpn/ccpn-2.4.0_p140513.ebuild
deleted file mode 100644
index feecbe109d21..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.0_p140513.ebuild
+++ /dev/null
@@ -1,166 +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/ccpn/ccpn-2.4.0_p140513.ebuild,v 1.1 2014/05/13 11:15:25 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.0_p140526.ebuild b/sci-chemistry/ccpn/ccpn-2.4.0_p140526.ebuild
deleted file mode 100644
index b88ced067d01..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.0_p140526.ebuild
+++ /dev/null
@@ -1,166 +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/ccpn/ccpn-2.4.0_p140526.ebuild,v 1.1 2014/05/26 13:12:50 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.0_p140605.ebuild b/sci-chemistry/ccpn/ccpn-2.4.0_p140605.ebuild
deleted file mode 100644
index 1190640b8e50..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.0_p140605.ebuild
+++ /dev/null
@@ -1,166 +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/ccpn/ccpn-2.4.0_p140605.ebuild,v 1.1 2014/06/05 08:21:27 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.0_p140707.ebuild b/sci-chemistry/ccpn/ccpn-2.4.0_p140707.ebuild
deleted file mode 100644
index db9202b5fcfa..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.0_p140707.ebuild
+++ /dev/null
@@ -1,166 +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/ccpn/ccpn-2.4.0_p140707.ebuild,v 1.1 2014/07/07 07:00:12 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.0_p140812.ebuild b/sci-chemistry/ccpn/ccpn-2.4.0_p140812.ebuild
deleted file mode 100644
index 4485ea1da04e..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.0_p140812.ebuild
+++ /dev/null
@@ -1,166 +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/ccpn/ccpn-2.4.0_p140812.ebuild,v 1.1 2014/08/12 08:27:13 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.0_p140614.ebuild b/sci-chemistry/ccpn/ccpn-2.4.0_p140917.ebuild
index d1a33eef9984..9136ad8d6023 100644
--- a/sci-chemistry/ccpn/ccpn-2.4.0_p140614.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.4.0_p140917.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.0_p140614.ebuild,v 1.1 2014/06/14 10:01:06 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.0_p140917.ebuild,v 1.1 2014/09/17 10:29:14 jlec Exp $
 
 EAPI=5