Cleaned old, python patches, fixed sed strings

Package-Manager: portage-2.2.0_alpha41/cvs/Linux x86_64
author: Justin Lecher <jlec@gentoo.org> 2011-06-29 05:51:28 +0000
committer: Justin Lecher <jlec@gentoo.org> 2011-06-29 05:51:28 +0000
commit: 10a72f7fd9a512e1e18513d0c957f2df82cfffd1 (patch)
tree: 3ebd03d0e6be652040066d8b77edfc0d2065d47d /sci-chemistry/ccpn
parent: Fix sed on *FLAGS from : to |, EAPI bump (diff)
download: historical-10a72f7fd9a512e1e18513d0c957f2df82cfffd1.tar.gz
historical-10a72f7fd9a512e1e18513d0c957f2df82cfffd1.tar.bz2
historical-10a72f7fd9a512e1e18513d0c957f2df82cfffd1.zip
22 files changed, 163 insertions, 3157 deletions
diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index d11bd97b0e1c..1d46109d4327 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for sci-chemistry/ccpn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.64 2011/06/02 07:36:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.65 2011/06/29 05:51:28 jlec Exp $
+
+*ccpn-2.2.1_p110629 (29 Jun 2011)
+*ccpn-2.1.5_p110629 (29 Jun 2011)
+
+  29 Jun 2011; Justin Lecher <jlec@gentoo.org> ccpn-2.1.3.1_p100806.ebuild,
+  -ccpn-2.1.5_p110202.ebuild, -ccpn-2.1.5_p110217.ebuild,
+  -ccpn-2.1.5_p110222.ebuild, -ccpn-2.1.5_p110226.ebuild,
+  -ccpn-2.1.5_p110308.ebuild, -ccpn-2.1.5_p110401.ebuild,
+  -ccpn-2.1.5_p110505.ebuild, -ccpn-2.1.5_p110526.ebuild,
+  -ccpn-2.1.5_p110527.ebuild, ccpn-2.1.5_p110602.ebuild,
+  +ccpn-2.1.5_p110629.ebuild, -ccpn-2.2.1_p110222.ebuild,
+  -ccpn-2.2.1_p110226.ebuild, -ccpn-2.2.1_p110308.ebuild,
+  -ccpn-2.2.1_p110401.ebuild, -ccpn-2.2.1_p110505.ebuild,
+  -ccpn-2.2.1_p110526.ebuild, -ccpn-2.2.1_p110527.ebuild,
+  ccpn-2.2.1_p110602.ebuild, +ccpn-2.2.1_p110629.ebuild, metadata.xml:
+  Cleaned old, python patches, fixed sed strings
 
 *ccpn-2.2.1_p110602 (02 Jun 2011)
 *ccpn-2.1.5_p110602 (02 Jun 2011)
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index 321767dc83c2..078de2e58398 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 2.1.3_1-dynamics.patch 825 RMD160 1941257b998a1063c4a7cce796bdf67415a0380f SHA1 d76089c3280906507c29af9307d35aabce1cd01b SHA256 53577b6f9621a707b1b5d676d57ed16f3963f3172598d944b823133908226edb
 AUX 2.1.3_1-impl-dec.patch 2818 RMD160 182cb26478750711916c73b7f9ba5e0caeb30bde SHA1 078fee172d7b9cf9f6bd653b53c87351b4625aba SHA256 f175a1b4a9cc4f1636bf36928883d37a266af830234aa3d7676f4fe4f7f1ddd8
@@ -19,49 +19,21 @@ DIST analysis2.1.3_1.tar.gz 18932918 RMD160 5f19ea6fe47c2910d16fcba8d1a78f0e1dea
 DIST analysis2.1.5.tar.gz 20338459 RMD160 b0706c859c1ee4da2ab80ee41534197268f73d44 SHA1 70dc5e6b2752d6b7d5c8673fc992ebd0a88e6ad0 SHA256 9f91f1bd56fb73fd24e71d396c96c0f0d31b92287664b6a2e756f6efc630b31b
 DIST analysis2.2.1.tar.gz 20974926 RMD160 5905f43fc1399a656f018808c4a2f8dd3d247ca9 SHA1 eed30da55a719ef6c29431e3b3c5a76f521010dc SHA256 d1252811b3db3a30d96a73368bae8abcb05de02fcd2f1f9c502d71dff5e00d13
 DIST ccpn-update-100806.patch.bz2 187965 RMD160 3297162fe3314aa405ee58737ce45cda084834e5 SHA1 338423d9f36da3fb10dc9d9a3b8aeb932ae3bfd0 SHA256 5cea7899edb96237a6674f04a1beee6ad7b309e12964ea8b25d9ea6ff752d0d4
-DIST ccpn-update-110202.patch.bz2 54603 RMD160 81d4123e155816c372702084a8d1433e256ec365 SHA1 57f4496f51b9e16b1eb5b85dcb332b032e61da97 SHA256 9f2dd2106ceef1fb120ee9d1f5973e2ac8105c260c8e981b429211738747fb02
-DIST ccpn-update-2.1.5-110217.patch.bz2 64228 RMD160 41035b6bedcb87e84991050aad8c8d5269f7d4c7 SHA1 7593cce4f807fec7e4c83bdf94ac65d4b3b09af4 SHA256 861eb26c2ad12c2566a5eab3a9abf2607ac43d511512717977a15069d73da049
-DIST ccpn-update-2.1.5-110222.patch.bz2 64519 RMD160 726a0b719d33d3847a4d89d5ffd32be73255a1b2 SHA1 69d5e2cae6813b45ed9687829c5ef6a3dcdb2c3f SHA256 c83c3ca35be51f29719d50622ee6700cc6c9b57640f6f002a66d46d256a42970
-DIST ccpn-update-2.1.5-110226.patch.bz2 64972 RMD160 d5c6934a68c2a02d042c67329a021bbb3bcb97c3 SHA1 9fcf7c1d7053fad9e61769b16c5415c20a56bef0 SHA256 70ebf213b699d1fe4303fcf6c60332863cec02c1284684cdafb502d4af5de79f
-DIST ccpn-update-2.1.5-110308.patch.bz2 67868 RMD160 7b8aeb929a1f77317d9eb60a7ca830857baac826 SHA1 6ddf0f94086e5fbc26be338002bc98f3944090e3 SHA256 9f70b1ee0bdf302df3f3c91776dc549af0a8a7c7e3088b6e79b9659c16703cfc
-DIST ccpn-update-2.1.5-110401.patch.bz2 75380 RMD160 20acef6c31a9e2252a6dcec23f965ae7d498f6b3 SHA1 084b4270142b04c02478e742e2e312c4410ecf13 SHA256 896fc00dfbe97d5ce1bbeac91a2221a79d8d112eac208202cede1a5396286ae7
-DIST ccpn-update-2.1.5-110505.patch.bz2 78824 RMD160 0deb492900e4fd1dab18f44924ea4ab242251cd3 SHA1 c5d8a59df36f73125a27dc25fcb09e36fcb1990d SHA256 cc63f88d0676258c931909a7e6055c110e661e12e0ce9f8040402a25d76e9319
-DIST ccpn-update-2.1.5-110526.patch.bz2 81262 RMD160 6070db12c97422a56cfc93112976e7c829911534 SHA1 3bb2ba67da979d726864a866ee53394e510e15c8 SHA256 23fc2518243705bf41216b1f641964e9348342471fcb5807f611eaf32e8f456d
-DIST ccpn-update-2.1.5-110527.patch.bz2 81455 RMD160 9aa99530334ee2e204ee69cc7831ddb0f2e52b7a SHA1 17dcb166f259ceae457ce90f89cf4e664c0557c1 SHA256 2eb84606e79afe94ab0775a34770e4696237e91628ed496ee3c7a52d997a5364
 DIST ccpn-update-2.1.5-110602.patch.bz2 81505 RMD160 2af0d5ca21828ccc3345ec763edfce81f2e12d11 SHA1 cf4a8613ecbb11421a4fb007500a6090b017fb2f SHA256 c8880d295914ac95c2ae2f0ffe3eb57e0e2b1b6c3c573eb31c8a40852c5cb886
-DIST ccpn-update-2.2.1-110222.patch.bz2 2346 RMD160 89ebe4954b56b25e59f81a7243af088068323f11 SHA1 4b94bf6fa2d1bd1dd0d4bdd2fae4a6caf64b0d1d SHA256 7dd92ee0350beaefddbcbd62420aa5b3699f0797f31a4d47799d2669d8499b7a
-DIST ccpn-update-2.2.1-110226.patch.bz2 3836 RMD160 95d07934ae6ec7d434c1cacd01858ab606ff8ccb SHA1 eb8a735785206472b5681fdbdb700d3126a6ec9c SHA256 a7576d8e3af8083f324bafa85b598616559307725a00780380de6f5909ea6b4d
-DIST ccpn-update-2.2.1-110308.patch.bz2 8112 RMD160 6985dd15b0a705b787ddc5d06c16a66575e4dee1 SHA1 c7726a10cfdd94574d1cbc55ea68d63148336251 SHA256 223a40975ccccafffdf08167b3eb5885a826402092fc5d8e23723f01f5b34e48
-DIST ccpn-update-2.2.1-110401.patch.bz2 20666 RMD160 193d7f86ab75d2a862953683ec503bed947f3468 SHA1 cfab70216cd485a68234c06808abcdf51b917d98 SHA256 15468c3e1412d9d2c97ef52bcaac255d65d79dd3016d0ae3adb48f7f3d0dc46f
-DIST ccpn-update-2.2.1-110505.patch.bz2 44951 RMD160 dd4a3cd1be1dd3155f1ade758e8775cbb7d3904b SHA1 0ce1ecf46736ace3a073e1154ed2f7280d502aee SHA256 f661602210e9bc4a7d45df78cfce6893962ce53c4f30a92439344c533f72be95
-DIST ccpn-update-2.2.1-110526.patch.bz2 55034 RMD160 6c6fab4c048cb603f2964db9fc4d98ae06b493a5 SHA1 e6307ffbc62d4ab56434171b1e90309c6a2d53f6 SHA256 5051fd896a31572402d6b8a3fc824dced6e8f1d26abde17b2ebf0ace7f748d2d
-DIST ccpn-update-2.2.1-110527.patch.bz2 56349 RMD160 f28b7dff03d10b7adab7db3dba7d7c5243817698 SHA1 5ee35f14f233eead9066b520c46820614271ea6e SHA256 aeaadc6afd804003fdd13fe99955561c2da4cd374a7c5be672285c4129c6b849
+DIST ccpn-update-2.1.5-110629.patch.bz2 86224 RMD160 d4cb190ce84f62639d77f6592475746e8b9f6a0e SHA1 e20f3313853dff4a3de723a2efc70efe81c63861 SHA256 df847050c95ea925db16a5c6630861e308d39286cc7c207efc4360fce53e29b2
 DIST ccpn-update-2.2.1-110602.patch.bz2 57084 RMD160 502c9ca948caf7be5e87759222982a952dd81bc2 SHA1 31725499eba0bb851357227fc4db274121a32240 SHA256 591be1c0c5dfea56c7fa8aec5da154a2a7263a11e8e20ff2a71a2e6e484c6e00
-EBUILD ccpn-2.1.3.1_p100806.ebuild 5190 RMD160 c1dd4e2443ab5cf8386627a9feba25be6e61b715 SHA1 0d9700191a04c6ed5f106e2712b010d499315827 SHA256 ed26ef362193f91d4726fd49a1c4b19c1f975c3847b0616ada2e64ce7a90ffa5
-EBUILD ccpn-2.1.5_p110202.ebuild 5770 RMD160 98c49d481a5a0e28d2f62b303950bab3467c3246 SHA1 2fb5b0d792b4dcfac20f4d11d405104ab5f81129 SHA256 77d1d7239204ffa4247501133996478e13f07b863fdfebe5d4b056089f9e08ba
-EBUILD ccpn-2.1.5_p110217.ebuild 5794 RMD160 acbb36a1c2f01d9d6944b421b20f5c6ed8a2766e SHA1 268ced5e44ed04339e96242560c06d84ebb3031e SHA256 b6b776e2972389b0e2cbd8054c4a52bb50a5310e5c99364bd7b4ae0cd32c3872
-EBUILD ccpn-2.1.5_p110222.ebuild 5794 RMD160 3a528e62388cd87f6911d00049687f4ad8a21990 SHA1 3c4443f4caa7a7138cc4e33d7ae29988413849db SHA256 b7b1180d996abc515d8d4040c6119f3798b5d8c2f035b5d57f33d05616f99cb9
-EBUILD ccpn-2.1.5_p110226.ebuild 5794 RMD160 0ccb454a05faa00f6ef9087ad979ae0bb12eeb57 SHA1 cf8cfe88e665772cc6e2c8d42718ff711d5b6c4c SHA256 3e7548fa407b4cc3dfc30618f100b515f82bd6920d5182cddbd5cf0003bf9d22
-EBUILD ccpn-2.1.5_p110308.ebuild 5794 RMD160 cd635335e052642cc6216b646aace2ab625a13e9 SHA1 6cc2205d0ef6b7304f3f6041f91a01a0da803fa6 SHA256 0a8f7cda9fbc99e1a9f16c3081dcd7920aae188fbecedbb2f1a4ee6fba90770d
-EBUILD ccpn-2.1.5_p110401.ebuild 5794 RMD160 d28f97f70b7d2c7e67680ccbc7dfa80f3c7e4c16 SHA1 995d70095ca28b0f4e24cb3dcab85ffd66a0e55f SHA256 1562e73abd583a6904b16bda472e39c0e384392014f76b706377ca871bf91033
-EBUILD ccpn-2.1.5_p110505.ebuild 5794 RMD160 a3762c3a58722466535819233def936b48cae77b SHA1 6c4550ef6ce6d1c36e0bf07aa060dda6395024ca SHA256 e1fb6a0f5ae16183080a4df866a917810505772ec8e756356ff67481ec24c2b4
-EBUILD ccpn-2.1.5_p110526.ebuild 5794 RMD160 d58bca2cf4604fb18b6ea002206cbbe91b12fd50 SHA1 a27e07aab1e3e366b39eeaf2069d26b7746a5501 SHA256 e43f88d83d43df963dcb6fc72af81d6e21a1c4dd3bc6506b5bc56d18fe0874fe
-EBUILD ccpn-2.1.5_p110527.ebuild 5794 RMD160 1551003946619dcbd8fa6782917263d531d53fc1 SHA1 776f4daa263e58b965934d4eccbc7d08057c366c SHA256 ded2febbbf17a484ba4b3135e23e84f6b06ddf27caf086b37d4c3073066fc3f7
-EBUILD ccpn-2.1.5_p110602.ebuild 5794 RMD160 b0298fe61d7d816a0fcb99174a729e8af6c06732 SHA1 e742b7849f3f884465b051ebe58e1466a8f88bbb SHA256 94e1744eca771cf56d82d32fdf6e1d77b58534bdfad50946a8b08ad3ba9def7b
-EBUILD ccpn-2.2.1_p110222.ebuild 5806 RMD160 9145fa2208f389a1399e91a3406190cb92ebb6bc SHA1 8b978ecaf8cb6992a958170b80a71f9399726b5c SHA256 a7102fefe463355b9a0119850fb3c1ae597c663814ac83e340908820eef97be5
-EBUILD ccpn-2.2.1_p110226.ebuild 5806 RMD160 ec1671816fa06ddc53a3bcd12faeb3869dff5094 SHA1 85922fac46dd185e7ebd3a3a4dfb61cf942b2adc SHA256 34942eea58c13108a7605de8b0721bdebd5b0b320b0b596c9d084e90f6059a85
-EBUILD ccpn-2.2.1_p110308.ebuild 5806 RMD160 a85b12264e5717e2564d97cbd9b1c3d5d685cd32 SHA1 371ff75268ca9a0cc9a37df35c4c57641ea70707 SHA256 7f9bfe05904a1c5320c3e11a1397227f0f6d5f1f59dd8288045aef84513a8c5d
-EBUILD ccpn-2.2.1_p110401.ebuild 5806 RMD160 9ead6d298b01630008ac0caab8b9a09b5af72feb SHA1 2977a61ae37b49ff5b978aaa274632f74de47ed4 SHA256 b7a12ad78c0b4ddac1400e4d26fa24b5c024de5cecbd814f7f922a348f2cdc60
-EBUILD ccpn-2.2.1_p110505.ebuild 5806 RMD160 215de2ad1e2c8a9de38aba1f4af80ab0c0a8bd79 SHA1 7b994bf07bd09beeb248cb8bd1ba7458aa8b9916 SHA256 d07bca5797de82970ca01e7c15b0390afd3b4003e200242f0a04529a95d2a3de
-EBUILD ccpn-2.2.1_p110526.ebuild 5806 RMD160 ff2b7937c2fa1a2d99251f28bd3834a654705a13 SHA1 adda8f2dee3181626731f410a45db92513c01979 SHA256 b72aff1ba5a448988c7293fcd5184454ca503497dd801efa4e0f1c737145269e
-EBUILD ccpn-2.2.1_p110527.ebuild 5806 RMD160 96251a79c28e9c96856012fb81acd6c52f1b9558 SHA1 beb2fb075bf8d22e25f1f1471b5c296c6c3d4410 SHA256 57e40eeb06d49129b130ac85c77edf034199f9609a1ac29da1392b75fe991b40
-EBUILD ccpn-2.2.1_p110602.ebuild 5806 RMD160 bb7cd83d8e0ff48fd517ce70c948a2305bfd9d45 SHA1 652e4263cde3ceedd316616b73d2ff1e2a2e83e1 SHA256 c4b9ff9d4d10cd8e82ca640ae2b751f8b51dfae1ca61adf1ec43a43fabd93776
-MISC ChangeLog 11174 RMD160 b50473e08b7e86b1445e16755a9a51d7a6bd5ca5 SHA1 5b4f94aa6cffcd4447f96e09a99b273874ee12ac SHA256 3b07709a5c226220a0ceda638b65380048cf2b2d04c318e8cf55ca59e204aea8
-MISC metadata.xml 317 RMD160 6e56ad407f163d80504468f6fedcfb35fc31db00 SHA1 30b72b0612b1f91712537d24e3a2407eec50e1dd SHA256 1fb093ab05124dcd078fc93a4aa6f787f5829066e100ed98da8ecf65cece63fb
+DIST ccpn-update-2.2.1-110629.patch.bz2 66050 RMD160 8d3b37d9c848f177b4c35f36eccd1026500af0b4 SHA1 66371f52b15ec8c689c1634fa30f6679c4e8c681 SHA256 99280022b594a45d1bdb9811f0f78851a8cb8282476c521987def7ab13cb0dac
+EBUILD ccpn-2.1.3.1_p100806.ebuild 5188 RMD160 b66825e37b79a5f6ec6635b9f3236d1cda2da672 SHA1 458f516ffad25d9283b21c9dfb8e50c6323f4264 SHA256 ff57abefefd3bb128a3f96bf039cbaa5ed97350f6b41fdbdd4b4365ff9e68e51
+EBUILD ccpn-2.1.5_p110602.ebuild 5794 RMD160 8a28dce36877c1bf37a188364d831322f6a88049 SHA1 a5bbc2015b8b7f7f8a11e9a6297be2f80edcf585 SHA256 6c28d2dfd433267d1dcd5ba25de0ae6a8dcfd312df2943cca70e2eb896b2343b
+EBUILD ccpn-2.1.5_p110629.ebuild 5794 RMD160 a4bc4bfc58ac834cb2551366e8eaf59eb9079f6f SHA1 679454b9f8f7317ebb4b75d9729efe2ccd8fcd1e SHA256 4eb9b69f024bf309d9f88468528aeecffa03f14e96d59a5fca3ce8733e7f6bf0
+EBUILD ccpn-2.2.1_p110602.ebuild 5806 RMD160 ad1b5507ba8c6534023cf02498a1689ebad49b71 SHA1 18935d2bb4af71fd0063927084d5bb1a454672dc SHA256 e5d6eae560e472bfa730454d37dad7d7979ded74a2fa7bbcec963332d68d7c0d
+EBUILD ccpn-2.2.1_p110629.ebuild 5806 RMD160 a63bf6ce2b38cfb5a39a1b98a0666d492fd90c87 SHA1 695710527df0138d62a448870e0a3809aab1ccae SHA256 fad2ae44188fa8fd22f1d0096c9d2164ea947e57f170683e08781fb7f1364f60
+MISC ChangeLog 11961 RMD160 0ad57d8d32b727f6fe5d72c6066bced12bc4d2df SHA1 63f48cc0a6eea9c2107f91facc2e952440440c2d SHA256 50c21ac72dda8e4c6bf4d9baa876124cfaf6693a48e77945e183b2a1b222cc1e
+MISC metadata.xml 322 RMD160 9fd5fba7405b689fc39a089d81ffdaa9f961b514 SHA1 0c31132b25fca04cff97ef11fdc11940f90c77d0 SHA256 7468ba4c27b879e7ed5f82274f5837e51f1f389673a33b9e26e1756a6b0783df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3nPXkACgkQgAnW8HDreRYerQCeM4q50Dxc5D/E9cHv3z3hj+B7
-R8QAoLp+ayrlbNoSlMl+dYy+WlBEV+HM
-=u1Zt
+iEYEAREKAAYFAk4KvXYACgkQgAnW8HDreRbnSACfavpRAIYzqszj2tAi1KPHLMCu
+N/8Ani6MJ7BMeIBh3DudsUrendoq3ThY
+=I97d
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild
index 0928cf987763..c81ae201d6a7 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild,v 1.3 2010/09/30 20:04:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild,v 1.4 2011/06/29 05:51:28 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -70,23 +70,23 @@ src_prepare() {
 
 	preparation() {
 		sed \
-			-e "s:/usr:${EPREFIX}/usr:g" \
-			-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-			-e "s:^\(OPT_FLAG =\).*:\1 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-			-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I\$(PYTHON_DIR)/include/python$(python_get_version):g" \
-			-e "s:^\(PYTHON_LIB =\).*:\1 -lpython$(python_get_version):g" \
+			-e "s|/usr|${EPREFIX}/usr|g" \
+			-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+			-e "s|^\(OPT_FLAG =\).*|\1 ${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_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+			-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I\$(PYTHON_DIR)/include/python$(python_get_version)|g" \
+			-e "s|^\(PYTHON_LIB =\).*|\1 -lpython$(python_get_version)|g" \
 			c/environment_default.txt > c/environment.txt
 	}
 	python_execute_function -s preparation
@@ -107,11 +107,11 @@ src_install() {
 	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
 
 	for wrapper in analysis dangle dataShifter eci formatConverter pipe2azara; do
-		sed -e "s:gentoo_sitedir:${EPREFIX}/$(python_get_sitedir -f):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:${EPREFIX}/usr/bin/python:g" \
+		sed -e "s|gentoo_sitedir|${EPREFIX}/$(python_get_sitedir -f)|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|${EPREFIX}/usr/bin/python|g" \
 		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
 		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
 	done
@@ -124,7 +124,7 @@ src_install() {
 
 		for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
 			sed \
-				-e 's:#from __future__:from __future__:g' \
+				-e 's|#from __future__|from __future__|g' \
 				-i ${i}
 		done
 
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110202.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110202.ebuild
deleted file mode 100644
index 69a008238996..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110202.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110202.ebuild,v 1.1 2011/02/02 17:18:02 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python 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"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110217.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110217.ebuild
deleted file mode 100644
index f29781f7beb6..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110217.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110217.ebuild,v 1.1 2011/02/17 11:39:12 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python 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"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110222.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110222.ebuild
deleted file mode 100644
index 80608cf7391d..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110222.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110222.ebuild,v 1.1 2011/02/22 10:35:38 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python 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"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110226.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110226.ebuild
deleted file mode 100644
index 71ba615e8a61..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110226.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110226.ebuild,v 1.1 2011/02/26 11:06:34 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python 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"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110401.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110401.ebuild
deleted file mode 100644
index 6189b6ac9723..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110401.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110401.ebuild,v 1.1 2011/04/01 10:35:38 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python 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.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110505.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110505.ebuild
deleted file mode 100644
index c6fcc9cba2c2..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110505.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110505.ebuild,v 1.1 2011/05/05 10:57:00 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python 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.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110526.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110526.ebuild
deleted file mode 100644
index 8e0255f16ff0..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110526.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110526.ebuild,v 1.1 2011/05/26 09:37:35 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python 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.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110527.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110527.ebuild
deleted file mode 100644
index 28fee2bb741e..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110527.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110527.ebuild,v 1.1 2011/05/27 10:28:55 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python 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.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110602.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110602.ebuild
index 181c61bef7e3..4c1b27ce2c01 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110602.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.5_p110602.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110602.ebuild,v 1.1 2011/06/02 07:36:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110602.ebuild,v 1.2 2011/06/29 05:51:28 jlec Exp $
 
 EAPI="3"
 
@@ -81,23 +81,23 @@ src_prepare() {
 	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
+		-e "s|/usr|${EPREFIX}/usr|g" \
+		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+		-e "s|^\(OPT_FLAG =\).*|\1 ${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_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
+		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
 		c/environment_default.txt > c/environment.txt
 }
 
@@ -119,12 +119,12 @@ src_install() {
 	use extendnmr && _wrapper="${_wrapper} extendNmr"
 	for wrapper in ${_wrapper}; do
 		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
+			-e "s|gentoo_sitedir|${EPREFIX}$(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|${EPREFIX}/usr/bin/python|g" \
+			-e "s|//|/|g" \
 			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
 		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
 	done
@@ -140,7 +140,7 @@ src_install() {
 
 	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
 	sed \
-		-e 's:#from __future__:from __future__:g' \
+		-e 's|#from __future__|from __future__|g' \
 		-i ${i} || die
 	done
 
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110308.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110629.ebuild
index 585b43ac4d92..17f9370f1189 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110308.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.5_p110629.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110308.ebuild,v 1.1 2011/03/08 06:21:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110629.ebuild,v 1.1 2011/06/29 05:51:28 jlec Exp $
 
 EAPI="3"
 
@@ -15,9 +15,9 @@ 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.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
 	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
 
 SLOT="0"
 LICENSE="|| ( CCPN LGPL-2.1 )"
@@ -81,23 +81,23 @@ src_prepare() {
 	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
+		-e "s|/usr|${EPREFIX}/usr|g" \
+		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+		-e "s|^\(OPT_FLAG =\).*|\1 ${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_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
+		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
 		c/environment_default.txt > c/environment.txt
 }
 
@@ -119,12 +119,12 @@ src_install() {
 	use extendnmr && _wrapper="${_wrapper} extendNmr"
 	for wrapper in ${_wrapper}; do
 		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
+			-e "s|gentoo_sitedir|${EPREFIX}$(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|${EPREFIX}/usr/bin/python|g" \
+			-e "s|//|/|g" \
 			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
 		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
 	done
@@ -140,7 +140,7 @@ src_install() {
 
 	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
 	sed \
-		-e 's:#from __future__:from __future__:g' \
+		-e 's|#from __future__|from __future__|g' \
 		-i ${i} || die
 	done
 
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110226.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110226.ebuild
deleted file mode 100644
index c8918359f2a8..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110226.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110226.ebuild,v 1.1 2011/02/26 11:06:34 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python 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"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	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"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110308.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110308.ebuild
deleted file mode 100644
index 22a8d59e41ca..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110308.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110308.ebuild,v 1.1 2011/03/08 06:21:46 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python 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"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	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"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110401.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110401.ebuild
deleted file mode 100644
index 06c1e6109bf3..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110401.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110401.ebuild,v 1.1 2011/04/01 10:35:38 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python 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"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	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"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110505.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110505.ebuild
deleted file mode 100644
index 35a1ca6efd37..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110505.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110505.ebuild,v 1.1 2011/05/05 10:57:00 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python 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"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	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"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110526.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110526.ebuild
deleted file mode 100644
index 220c9aba86c0..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110526.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110526.ebuild,v 1.1 2011/05/26 09:37:35 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python 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"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	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"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110527.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110527.ebuild
deleted file mode 100644
index 1189b4c4bbf5..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110527.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110527.ebuild,v 1.1 2011/05/27 10:28:55 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python 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"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	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"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110602.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110602.ebuild
index bfed9397d760..554159e3ec8c 100644
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110602.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.2.1_p110602.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110602.ebuild,v 1.1 2011/06/02 07:36:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110602.ebuild,v 1.2 2011/06/29 05:51:28 jlec Exp $
 
 EAPI="3"
 
@@ -81,23 +81,23 @@ src_prepare() {
 	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
+		-e "s|/usr|${EPREFIX}/usr|g" \
+		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+		-e "s|^\(OPT_FLAG =\).*|\1 ${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_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
+		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
 		c/environment_default.txt > c/environment.txt
 }
 
@@ -119,12 +119,12 @@ src_install() {
 	use extendnmr && _wrapper="${_wrapper} extendNmr"
 	for wrapper in ${_wrapper}; do
 		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
+			-e "s|gentoo_sitedir|${EPREFIX}$(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|${EPREFIX}/usr/bin/python|g" \
+			-e "s|//|/|g" \
 			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
 		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
 	done
@@ -140,7 +140,7 @@ src_install() {
 
 	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
 	sed \
-		-e 's:#from __future__:from __future__:g' \
+		-e 's|#from __future__|from __future__|g' \
 		-i ${i} || die
 	done
 
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110222.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110629.ebuild
index 5c6451c73318..0bacba781a14 100644
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110222.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.2.1_p110629.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110222.ebuild,v 1.1 2011/02/22 10:35:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110629.ebuild,v 1.1 2011/06/29 05:51:28 jlec Exp $
 
 EAPI="3"
 
@@ -81,23 +81,23 @@ src_prepare() {
 	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 ${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_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
+		-e "s|/usr|${EPREFIX}/usr|g" \
+		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+		-e "s|^\(OPT_FLAG =\).*|\1 ${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_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
+		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
 		c/environment_default.txt > c/environment.txt
 }
 
@@ -119,12 +119,12 @@ src_install() {
 	use extendnmr && _wrapper="${_wrapper} extendNmr"
 	for wrapper in ${_wrapper}; do
 		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(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:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
+			-e "s|gentoo_sitedir|${EPREFIX}$(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|${EPREFIX}/usr/bin/python|g" \
+			-e "s|//|/|g" \
 			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
 		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
 	done
@@ -140,7 +140,7 @@ src_install() {
 
 	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
 	sed \
-		-e 's:#from __future__:from __future__:g' \
+		-e 's|#from __future__|from __future__|g' \
 		-i ${i} || die
 	done
 
diff --git a/sci-chemistry/ccpn/metadata.xml b/sci-chemistry/ccpn/metadata.xml
index 032b2a83a1fe..d65c846daad4 100644
--- a/sci-chemistry/ccpn/metadata.xml
+++ b/sci-chemistry/ccpn/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name='extendnmr'>Install needed packages for extendNMR support</flag>
-</use>
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="extendnmr">Install needed packages for extendNMR support</flag>
+	</use>
 </pkgmetadata>
author	Justin Lecher <jlec@gentoo.org>	2011-06-29 05:51:28 +0000
committer	Justin Lecher <jlec@gentoo.org>	2011-06-29 05:51:28 +0000
commit	10a72f7fd9a512e1e18513d0c957f2df82cfffd1 (patch)
tree	3ebd03d0e6be652040066d8b77edfc0d2065d47d /sci-chemistry/ccpn
parent	Fix sed on *FLAGS from : to \|, EAPI bump (diff)
download	historical-10a72f7fd9a512e1e18513d0c957f2df82cfffd1.tar.gz historical-10a72f7fd9a512e1e18513d0c957f2df82cfffd1.tar.bz2 historical-10a72f7fd9a512e1e18513d0c957f2df82cfffd1.zip