drop old

Package-Manager: portage-2.2.17/cvs/Darwin i386
RepoMan-Options: --force

8 files changed, 8 insertions, 1029 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 9f4aaea176e0..0228cde06978 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/ccpn
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.162 2015/02/26 07:50:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.163 2015/03/05 20:44:57 jlec Exp $
+
+  05 Mar 2015; Justin Lecher <jlec@gentoo.org> -ccpn-2.4.1.ebuild,
+  -ccpn-2.4.1_p150108.ebuild, -ccpn-2.4.1_p150122.ebuild,
+  -ccpn-2.4.1_p150202.ebuild, -ccpn-2.4.1_p150223.ebuild,
+  -ccpn-2.4.1_p150224.ebuild:
+  drop old
 
 *ccpn-2.4.1_p150226 (26 Feb 2015)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index da29e56a2b13..a158ad9c199c 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX 2.3.1-parallel.patch 850 SHA256 38f796a18c75b2ffb1168d22d1e1453faa480e4c8b0e3d75db2b0603ac4d6788 SHA512 0597e21c03baa27e2342249814fc0700b73cf2800173468574ef704d48f7e6e042ac6ae552bbb9e27fd4baca36cfaf60a1eac9813354916b3e8295a35b64dcdf WHIRLPOOL 7fec03d065add264de91aa07c211003e2471e77035f36c497c325c4319e999d83c06ef6f496ebab966d0877c89101e26ec7ce86ea8b740973c0254ad118e3e26
 AUX analysis 283 SHA256 f348aa9c9a5f7f380836b0dc62d8a1c053f69e60a441c7ae4abc45f9d8374a7b SHA512 f2dd8216021201b0f9307f8bb82033c3ebb1c9f21450ae206e59ad6442b0cf0f8fc6e4817d4347eb78a9528ba1ef60bd5395708067352d11330215e5ce2568ff WHIRLPOOL 52b60235b6a0421c985d06e28622b88106f9f24395dd9598e83d956f3c619d67248f7c71ac8c211167e06f0540a8aed16c2ce1f8369730c6fbb62269f7384fcd
 AUX dangle 279 SHA256 650da642809c8e65d7bed46465b557b4388c9b04556d860d8fbb07e35c960b7b SHA512 21fca09578aa13819a20f08ff414ca2b8d08d177a1ab09f8d85c53ae20fc6f38ab46e2933d72c239029b37ec5eebc3162f0c8e99f1ca1dd20aaa49277fac4e7d WHIRLPOOL f9b768f524a1c25e340e5738aef293140c39e49c8f287788fd8f6a2d921c9d72f3ab4333493cc4428d71b4942864801e23e46e1e72976c50e1325e58a257f9df
@@ -13,37 +10,7 @@ AUX pipe2azara 290 SHA256 d656e61005b0a5e49fdf835febac8ad334fa946fadf577072ed699
 AUX talosn.patch 1358 SHA256 55e4e412158b851f040ac25d93b8b1a42ffa6354c26327cb8803288621787518 SHA512 fb4b74d0b07b9edf47135bb5d965b485ee62fde8e33c3b4dffb09092063368de6ae54435fc82aca87d88dd9a71cb1abb96446241c7d433bd2b0b1801e3e5ed5b WHIRLPOOL 5ff7c76822d8de0545d235118d50b80c0c6321d6b11ce9f3f0d1f36ae0c68d9d5753fdc8f81ef95b46345085c5dd6a349fdc70ff7f22a7e195fcf26d4475211c
 AUX xeasy2azara 288 SHA256 e116e19f3cb7bb10a75b75608ae6efb93dfb710e86fece357f3003913673f14a SHA512 e9a3dedc155f9f7b163eead73099532653454a7f5f12042348abf87a4e8930cb8b0b66fd87ef9fcc3b395c92d7e4942829ec8f5e7a1c28c7b3ce51022b8fce6b WHIRLPOOL e021756a059dfdf0f7dfdbac0f1740ec90a31d1b0f2b70d588d7574a0fe4f0607ecfc52b58a7e3f5140ff4e7fc4054f8fa11fa467aa41a2ad09ac99a24678979
 DIST analysis2.4.1.tar.gz 36088236 SHA256 1cb089dcc739e8536d938a68536f556094f5d728907b251fe337758ba5bef106 SHA512 db44468c360d51815614fe0055505001c0a7a722f980c2c049c00524672bdfd4a507134ce1d68b29ebf622ffe94e0c9bb9685fea5b3441790b997a64f78c0dc1 WHIRLPOOL b53fc0438a878a8f8ce0244f5c1ce9edb616665149a699364e3bcd38c5db548c22b80ef67b4183ad5321b71b69a3b85aecc7d912893bba947700003a411651ac
-DIST ccpn-update-2.4.1-150108.patch.xz 8364 SHA256 a2223d89dc279573871263093fedd9cca1a4ee3f29036d329c50448d6132c8f2 SHA512 32dcc3ff75db61cedeb2ef317b8a9bba1edeefedaeb8a0bd29735842c0b6f596aebe9a511f1ea447323786d092fc9930b3029d1c1a236c4c365a616841d79608 WHIRLPOOL 97ade62a3a8e735bc867e897478466524288929c8f20a19ac6a9bf6e8f524dc1010a8941e90ce51af3722e7775bebf78b5ed80b7a3b80318e83cd623bb8a6f9b
-DIST ccpn-update-2.4.1-150122.patch.xz 9032 SHA256 68c186762beb4600617f2dd71c14bacbc118311e0c9fc3c8ff53a22fc5caee05 SHA512 965ea204cee3ec54b7955c350769e497668fb2f134dbcc7c13d5169f49288e1855ed0824a9b4d8b39db990280145fe2e4f8de724eeddb2321db715e4a7565886 WHIRLPOOL f4c876a51cd4fb37f3dfd9a278f760c05bbf2a7f33c0e59d929d8c43ce931e4c6e177a05b084f9f7a57cc84895be071bf230c06c67fb7748d070e4f8db987b0d
-DIST ccpn-update-2.4.1-150202.patch.xz 9408 SHA256 75998daca8f25c212fcf50c122821949dda729102863e3c3c1cac66ce7bf02e3 SHA512 7d4e593d115e36a031178c13b0c1d237154091ee21ae0d35fae9246f2a0845f6ca2e81e7e0fab645355ac013fac3a0e46e9811916c55aa1c2239a640bc5c66f8 WHIRLPOOL 2b9134e31f137b823e10d3e93fc99bd217b6a5136f0c19c41e493eee58a30e5d4041699b6a13c858ac185f28ae9ccba25ff0ea935f577023b84ab00bfba90d66
-DIST ccpn-update-2.4.1-150223.patch.xz 10304 SHA256 3a045588005688466c13ca880de1ffb191ca8f8e277696d7420d6d19f375c9c5 SHA512 ac910a56f8221f1eefdc8d83b643aafb84a9e77169258e40c1e36b1bc95dba083f15488181d2ee34f22f341f989875825a77a318583537bd8fb4b0647a091421 WHIRLPOOL 05c02ba3ca614ec8dd586048a00c05fc66bf6fe2093f1bad2aa4ce69223fb498bc9640e72231765f86c5bb3f685e9b2c88dfe8a9afd9f43e130818ae62bb2aa8
-DIST ccpn-update-2.4.1-150224.patch.xz 10472 SHA256 8252e2e298b93c4cdf77cfb247d821a6ee3d95ee573fb03cd64e3c32a7bec9da SHA512 6905d352b8b12a6699de076e5bd8ce4c1efd561f4e062919550f8752ee1d9c304d57de18d13f810c71e12b236b70dc137d055efff6a2f2003c0bd42d4ca37540 WHIRLPOOL da5d69ee8ae9eca5536aa8a3cd5d01ba8c37cfb3b0cebbbd101d2bdeffef36399cb5454df51db62c4864051b1edb888bd8807c648564d736b0622adac699e8c4
 DIST ccpn-update-2.4.1-150226.patch.xz 10732 SHA256 74e8723d310d336cd4215ed4e9a1a1c0b2c0efdb4c03aaacba7ecd0575b38287 SHA512 60eb4acf6179f80207a72076ff5d5d733d3c3e804c1ce0a48701dd6e923146af49cd6759a529c8125f4b26eb3f8f83b35acc0c48b88a3e3034b25b5438a04feb WHIRLPOOL 3a2357d4fcb086206d45edd5b9cc807313b5f62be2f2a70e8f011f5521cf8729371b8c7149837c4ea1f6f059e26a49c1d20492f338a844e15f38ccf543faf6e1
-EBUILD ccpn-2.4.1.ebuild 4685 SHA256 6e4c496453063dee64e64975a5732f6bbbc820bb97dc460691187ad15dc3e935 SHA512 a862d7ea10818bf2f219411019db151255a1e09f8e72c7a37eacbe7220b8640958be43079e995828f055ae62e93d002540de5be8f0cff231bb5ec62dbb0e8a8e WHIRLPOOL 6ed8127f87305e1406aed474089a478423dc0ae6b3c81191d650de680d22aea2112c62ac63c02a76bf219bcad49451477682e3ad187999764bcb02fb105e1e58
-EBUILD ccpn-2.4.1_p150108.ebuild 4692 SHA256 cd8f2a9327714d07a88b714353299e078b6177444d746510e55dc7cb4c4b6e91 SHA512 94b835c77fec900191f3819934951938e864fa061e25c8a6e885af527947fd60510ec4dd8a65661996233d3de97fa0143803c7ba59508c79900676341e628721 WHIRLPOOL 638ec09624e702b0fc585a8eb63bf4070cd598e3b49032cfd4bd5f82219a77a16c832caec032f59b30e6ee1d4fbb41cbe7611a4d3b4e8c14f1f61a5942f79109
-EBUILD ccpn-2.4.1_p150122.ebuild 4692 SHA256 0c0b2c56576f3a3cc739daff25121339ba5f2f455e57ad76485246c30ba80399 SHA512 824858bba9edf362fee4154921230acba74362e2523a6fcb3807bcb61c37f3b21342433c8a9f4c2f2251f4ba3f472dae68da419f10fe018dedf61430cdd647b9 WHIRLPOOL abfa19b1bd70264997d8165dda26833c07a07b230c59c7e8305f209d4f5c20a78e4037ca89e12b3048f9ca7bde25b308d06e0e31db9d0ae3ed79bc4a1535bef0
-EBUILD ccpn-2.4.1_p150202.ebuild 4692 SHA256 d251bca04241d02f7235854d6756217e093370c7b5f11783fa1cc3c6e13d1593 SHA512 35a4f2b9c0825287b80997c338f3a393abbe9f6bb3eda067d530b02b58405ae1a0cb0bb9000f8667a5ee075e4b5fbbc56d6cc61406904d0102e513595c7525bc WHIRLPOOL 13f36b5c4954b530f0989969a27e2c662ecb08573fbccc7b6e2eb3f30f94b4badafde3049deab2e0166df8b5ffed24c705c54dc2a3fd1014718a217fb6505cba
-EBUILD ccpn-2.4.1_p150223.ebuild 4665 SHA256 9fdd0f3853099f79523ae3a02fb9b13cd00203fca252d2abfc81f078a2c48c71 SHA512 28d87e62296ef54ffc0e3f679295328810a59ed1263a078ef84969d0c8ffbde5bc99cd67dc576c4ee6b68d7b2a3c4387d8fe5de7bb1294638c008d451da09e20 WHIRLPOOL 4a7a66c93b5d0a91bbb59f9a0ae2ec028673b1c987822f41420cc570d804f2fb3285edd7a618415ff87013242414b101d9a6a140ab1f6841b0542503c772498c
-EBUILD ccpn-2.4.1_p150224.ebuild 4665 SHA256 0584408fe4b5c066ab1187f418668c082e489f075e5b866523ae6e8f0a63ff32 SHA512 14b742ca202a61502baa92952dde26213bc4cbb77b70f51a57f2c6565244a4895a5b9a04188bbc6a83f27e8b6bf437232e3007badef3d1fd6b38902b84048f9b WHIRLPOOL 6003edd41c833dc196d39537e0d8ff6bd4457c37e13d97e52793527d9eed500a89ac40d78a7320fc4c6ec8ba82728b919842eb03965c4921ce6832bb38686e1d
 EBUILD ccpn-2.4.1_p150226.ebuild 4665 SHA256 44cdb0520b2b85dc73cbdfc88f44a295248ac0e45cbdbb26903926ed402d6286 SHA512 10e2803cac416d7b0c72cb7eb00ca7feb6288b58a60b0380f6af10245fa50ca0f7ba73ce0217f5436e6f5a8d68e9e8b7f21eadb9090a25186b308bfc8f5a3b4c WHIRLPOOL 05c39ea06d48ef3e2d7dfcf1c494b4c96cd237c611b4df41bff0afa782af949d387aa63f0820f7f48186ad5243bde730b336d3658a17cb5622d67bba107c9d19
-MISC ChangeLog 30738 SHA256 00576b1458ad603eee29c00ac986116a5000ba6e93a8c7e691a5c3fa607bd2a4 SHA512 797140ca190629dd099ebe9cee5fc57b21f3a8fbc9b239a06ba073c6a2ae728236294c1550eb5b17430b84d77c7289921b0da62e82cc49fed7a4b73609a72e24 WHIRLPOOL d1ad9260f774354e01124b5dea485e1185140217d9eca1c46ccb4ccc8750f2180f235bc651b0dc55f9f8119440bd3a89bb59eb89feda0338d9fd50cabaf1ceae
+MISC ChangeLog 30963 SHA256 387b6e215328a7c4b899a988d1d50ff6d3652bc2e70a3447bfa7fe7ae806a2cd SHA512 796aa95922f97a8f067ff5a96df49c2787ab15f4c5cf19426e703f9d709e0d94e7d75a19f9203fa9772f849ea4c72005498e1ab93b12e9ea46b17d4c866f979a WHIRLPOOL f5a9a368095e0fccb02759a558ee46963155644511e9fcfaaedf5404e738ecbc49839c820eef123168015932b00b06787a75596899252c7f3d4c48a4a1de8fcb
 MISC metadata.xml 234 SHA256 8297e76ecd2cb828f604e9f138b263179eb84beb640215a0f60d7613eb46bb7f SHA512 0e94c0e6570a9267a39968d81c3b80680ccbc6eebb62199e4830b021a114c94a0de17ef2103cef62b7e27da1f51f225a30abb802aff82140ae6dc43366113d31 WHIRLPOOL fa6d4d90b092953b88ed3ad03e1e8c189296d268b39d13a4b4dcb78f0c4456341e3f1b44eea0860054fee43079179cb7cf7a912acf1fbe693ecdca6d9a65f081
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
-
-iQJ8BAEBCgBmBQJU7tA/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirc8AP/1+P+HeQbk2n54wRijwZjL8t
-IC2klDYi2j0krmi/SLBwEEA38ukbVRgusVYwFTlN6T2hK06D+VvtdrPORb4HOUeF
-wgv95R4D/VmYTUt8Nn/+BViwxPFx7wIlD85y/Kz5d/wm5QRGisUMcLVbQcJlVhmh
-givQXh/oX1VhLkVhxHoBKjyLctfYft6WZ9DFR0RAkUs29WWjiigIvBZwSaXGWehc
-69qpEM0X0cQQ3FBglTIj6HvjkkvtmLIvhUA8pE9/ucqhyQLm5ZxZv/2tl9oTlX70
-Vqi1E/fURZ9l9vXBKhXIeLc7E4J06Ss8avuHnytjeVzn6qFVFvurDXN+TqrVwHRZ
-3KddnBd9bqQB893GuhiWdRJ8Ii3yMfXWa+d+h10+jhd18ZK/PIf0zd7R76qen8/L
-vhiky6b7Po8A97vVN+bpgHZjrVj0fqh384ZIxEUZxSSU3tVVtkZo38RMNfAXgpQn
-6PfInaH0x0FHWk/d+1t3Z6eh79tq1B3PxhreRt5G34jPJwURF9oVnW9+oAZZCrXX
-nE9BLVSuTkX2q/6DJI5MQaG5eqAooGv1cleyxEoXbcbdNQmS4OBROqiEWwwk+l6H
-RNYma1KLmzTdQeXtD02b3/2R9Xl1Hmv1JH13+4bDUg7v0um2LIy0KwRHwV0PHccB
-wlk8ZJcozp0bOlyEq3H+
-=bLg0
------END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.4.1.ebuild b/sci-chemistry/ccpn/ccpn-2.4.1.ebuild
deleted file mode 100644
index 13bb3cc0d97c..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.1.ebuild,v 1.1 2014/10/06 07:23:45 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-#PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.1_p150108.ebuild b/sci-chemistry/ccpn/ccpn-2.4.1_p150108.ebuild
deleted file mode 100644
index 0ba4565df18b..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.1_p150108.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.1_p150108.ebuild,v 1.1 2015/01/08 07:58:02 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.1_p150122.ebuild b/sci-chemistry/ccpn/ccpn-2.4.1_p150122.ebuild
deleted file mode 100644
index 9baba20420e3..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.1_p150122.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.1_p150122.ebuild,v 1.1 2015/01/22 16:25:49 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.1_p150202.ebuild b/sci-chemistry/ccpn/ccpn-2.4.1_p150202.ebuild
deleted file mode 100644
index 143601dcf9aa..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.1_p150202.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.1_p150202.ebuild,v 1.1 2015/02/02 16:51:59 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.1_p150223.ebuild b/sci-chemistry/ccpn/ccpn-2.4.1_p150223.ebuild
deleted file mode 100644
index b33c5c8207a8..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.1_p150223.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.1_p150223.ebuild,v 1.1 2015/02/23 11:42:36 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS=""
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.1_p150224.ebuild b/sci-chemistry/ccpn/ccpn-2.4.1_p150224.ebuild
deleted file mode 100644
index 7ae01ae66bfa..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.1_p150224.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.1_p150224.ebuild,v 1.1 2015/02/24 16:30:04 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS=""
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}