sci-chemistry/ccpn-2.1.2.1_p100204 -- Added todays python fixes

(Portage version: 2.2_rc62/git/Linux i686)
 (Signed Manifest commit)

11 files changed, 13 insertions, 1381 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 2cc27105f..87fbdd8df 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ccpn-2.1.2.1_p100204 (04 Feb 2010)
+
+  04 Feb 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +ccpn-2.1.2.1_p100204.ebuild:
+  100204 python patches added
+
 *ccpn-2.1.2.1_p100129 (29 Jan 2010)
 
   29 Jan 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index 2a48bba78..c842a746d 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -7,31 +7,15 @@ AUX dataShifter 313 RMD160 2f9d3ee79249a27c640f6bb19345f9f5dcb7e534 SHA1 783e377
 AUX eci 298 RMD160 f0fe555b91bc2cf4c8f2672e23468098d1d82264 SHA1 7ccf78da2f9d5e726882fa3c2057b4e798acae0d SHA256 02e065abb5365661346d7b6b75313c1b50fc752a6853618bbe04f0231c147a23
 AUX formatConverter 317 RMD160 a0f3424901c96bfffd01e8b8a667357b6a29f78a SHA1 cffb6eddcd15202bbda415938e0f9c75a4e98f56 SHA256 46e48c921b0d59b87bbd5dbda97065d35be7c8dd9f2234c9d97eefe5fa0d407d
 AUX pipe2azara 321 RMD160 c6ca09d178507af6dd2bff4bc8ad6765f4586b62 SHA1 96900b029b8bcdcc414b8e57877cac81d9aef95d SHA256 15fa8d6717e10e3e65d90d1bd89b81fb49a6b218923dc7d70234157c63286b0b
-DIST analysis2.0.7.1.tar.gz 18142642 RMD160 b345c8c8a3cbee549f0ddffbe76d208aa0a93b42 SHA1 f1cade41ce9d488926873bbc6f83fa79af7d9623 SHA256 8d37aa12a3e18a875dcce8689751144c5a949e3431395d00fdef49fbbb0f4d69
-DIST analysis2.1.0.tar.gz 18962012 RMD160 3997fe7deafd50142f60d036e82f436519efe1d0 SHA1 df86d54a13fa1c955f47889f1310b62edfd9dc09 SHA256 132ab4a39fdeedde24385b0c976adea43efd512fefcff7dd973790e9faaf9d95
-DIST analysis2.1.1.tar.gz 18972580 RMD160 17e0fca7dc6b1c272ebbff68cb2589ab3bbff9c6 SHA1 62a28269e1215c458fbf8866c2323fbc690a7ea3 SHA256 1da964a61b98e29735dce1ba75f5f1fbf76dcded3bf93aaa05a4f1c05729972a
 DIST analysis2.1.2_1.tar.gz 19227793 RMD160 f633a8338e3fbb9d8ad77c9482d63191419b0885 SHA1 f711a424da22c84295610483a6cc481d2d2161e9 SHA256 e7eda0b50c357a2b62633c473da4621ccdc48c747c59d8ccb495d57e846308fa
-DIST ccpn-update-100124.patch.bz2 21213 RMD160 51e4531acfbd57e795630e7dc6c260c2f92ce21d SHA1 8a065bb6cfa97ca88b15bac149c7af05c151fe27 SHA256 a075fa28527e1444b22340562cae4d6607d203a84cd163f404d0cc2854a66006
-DIST ccpn-update-100129.patch.bz2 23824 RMD160 845b61cdfacd59e42191303bd055c6a543970b12 SHA1 db5b66a29d86483142a7c57e46cc0b9f8539413d SHA256 357f6c2f4c912061f9b8ecbb2c857f8b37770037932829145fb4c5c38650f046
-DIST update-091012.patch.bz2 41959 RMD160 3ddb011d80935fea02fbf00fd06cadd32d86ecbc SHA1 467a41d1f634417739af09dc8a725f4b32238e5c SHA256 fe5051256f81d2f59a19b2463a7b6c5697680030b4b2823a6b6869eec85b8dbb
-DIST update-091025.patch.bz2 17170 RMD160 5b2b440b742345a815158e63e356f82cfce933f6 SHA1 569e370e819c940e904696e1ab4eae7380e035d0 SHA256 5467ccd9bb437f1d0720a02e2629120319a61d77cc246cbdbaadc89deb884a51
-DIST update-091220.patch.bz2 16551 RMD160 6a4f12c88be5e0a5af3f4ec560d4e795006ea231 SHA1 f5b1c31f82f8ae930b11ba742ea09c09a9b45d24 SHA256 e355f42fd1e82fbf39377c56472f20346aea7c5aab97df4c36c508a31b6dacb5
-DIST update-100116.patch.bz2 18732 RMD160 859527394dd98ccf8040bbd79fe69e7b93eb022f SHA1 87f0829faa329180783c11754ab04bf95635eac6 SHA256 9bf976ddad8330ce313b61757708ba6cf65eb47870aa8aa168a04bb7f079ad8f
-EBUILD ccpn-2.0.7.1-r2.ebuild 4550 RMD160 4adb7d8e25ae01b7c390475fa253e3408425e5fd SHA1 a177bc13e9f9da9f82e86acc6579ef3d11d227ff SHA256 e7f5ad42f1a095259c37ce9a6fe45a462fd105971b90719b3ad66cebe7e82865
-EBUILD ccpn-2.1.0-r4.ebuild 4167 RMD160 63f746dd33faa4a753d24ae0fc75c31bde3c3a61 SHA1 3624b2792b39a4db868006eb0711f180abb6dcd4 SHA256 3d82036ffcda14918e6924fd8eef89e56c85d1776f359071ad15d5620708f8e7
-EBUILD ccpn-2.1.1-r1.ebuild 4195 RMD160 7e67b7712b448f098c01fbe0c19d1f5eab7a8d64 SHA1 4580a861ce8fcafe6c82254117339d3a0fc36db2 SHA256 6a945186e8d349b3d53de852b8d651889cdc092f5b3123ec3c2c40b56b75c81c
-EBUILD ccpn-2.1.2.1_p100124.ebuild 4292 RMD160 9cafce52f78af25c9e02b8770d56e466d3b67787 SHA1 632e3fc541b5b24893cea043eb00b618e931b7ba SHA256 26687db3db96cc44e15fd46d48d680b2d442b5f614824c819f5da4616e441fd8
-EBUILD ccpn-2.1.2.1_p100129.ebuild 4292 RMD160 9cafce52f78af25c9e02b8770d56e466d3b67787 SHA1 632e3fc541b5b24893cea043eb00b618e931b7ba SHA256 26687db3db96cc44e15fd46d48d680b2d442b5f614824c819f5da4616e441fd8
-EBUILD ccpn-2.1.2_p1-r3.ebuild 4083 RMD160 2867b8e5c80c0391aa7d0d4688e383bd42331394 SHA1 f6ae4acb9a7a926da7d1219cd3918bb0e7c4ffea SHA256 061cc050cff5d4e31ce808705dc3dabe4b95c7c2a747659d3670347134757582
-EBUILD ccpn-2.1.2_p1-r4.ebuild 4110 RMD160 e692383d827c067d4c6c08eae4c3ebf7acb8ea21 SHA1 2f1022b4e729c61a34a5accc50831058272d2f9c SHA256 ae931526ced750af05329f92bffe57d1fc13b5535e39bf2cb440dead74bbb26b
-EBUILD ccpn-2.1.2_p1-r5.ebuild 4225 RMD160 8680cac8119d9f1624e5c8a38aff4429e10cf24b SHA1 fa17fda2ba1864728ea672084bbb73ca9976948f SHA256 c336ae6a9ea1c310ad91487b83a62d7439ff279a5d6671c138aa6e8d4376fbf4
-EBUILD ccpn-2.1.2_p1-r6.ebuild 4225 RMD160 7337ad67feee602a5224d5d28e4e69735b8cf2e0 SHA1 c28cee175f191dcbc4acf7841089fced91bd3724 SHA256 f32e2e5c77731c5aa9fb650342f938e4b1d20fee7e402d93e7107c5330e894c4
-MISC ChangeLog 6050 RMD160 9032cc151b9ba479d331748e9567bc40989e371d SHA1 e3a0580196e5fe6ee185e83402492966fc2aa3ef SHA256 bfb9643a04ad966f0c7219688b573920ed15484d4a8a257424a2cbd75a988eb9
+DIST ccpn-update-100204.patch.bz2 24401 RMD160 ec5f52845640706f87b7c04d83c6fb85140fd621 SHA1 f654efbaa66b26a596e77992ece2d8c9b2d41a27 SHA256 1888ad1857772a6adc79ec6d5e936e656cb2010532fa8b4ee7527a9938d5afb0
+EBUILD ccpn-2.1.2.1_p100204.ebuild 4292 RMD160 9cafce52f78af25c9e02b8770d56e466d3b67787 SHA1 632e3fc541b5b24893cea043eb00b618e931b7ba SHA256 26687db3db96cc44e15fd46d48d680b2d442b5f614824c819f5da4616e441fd8
+MISC ChangeLog 6207 RMD160 c6193ec5cbfa131ae44843610c302955a39d5e78 SHA1 ed89d6158e49224eab70aa19b764b659fdb16112 SHA256 459ab101fb5f1dc562eb345b369543f47b92dbf42e5de7b129913a5f9d0d2365
 MISC metadata.xml 339 RMD160 2e62dd84c66f8229f9f75832b91b3921a23386c9 SHA1 3252b1e326b3ba201266861d6461bcc069ad770e SHA256 bbb58d377587da3e6a2d4a742829e24b2c840be26d8e8da2d3f6fbf26c0143ec
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktjCpUACgkQgAnW8HDreRZ0YQCg0JVIf/ZA6jpXzirSvlzzRP1P
-n9QAnRIIGMTlDON2ofIojvGolphvUX6V
-=rNR8
+iEYEARECAAYFAktqkd0ACgkQgAnW8HDreRal4ACdF7r3eR07oakSS+EfnFW636i0
+K1EAoJ/UeZLVIFxdVqQ5jYOUWZcVk6lM
+=iDOM
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.0.7.1-r2.ebuild b/sci-chemistry/ccpn/ccpn-2.0.7.1-r2.ebuild
deleted file mode 100644
index 21d539e99..000000000
--- a/sci-chemistry/ccpn/ccpn-2.0.7.1-r2.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.4
-PYTHON_MODNAME="ccpn"
-PYTHON_USE_WITH="ssl tk"
-EAPI="2"
-
-inherit python toolchain-funcs portability distutils eutils
-
-MY_PN="${PN}mr"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${PV}.tar.gz"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc opengl"
-
-RDEPEND="virtual/glut
-	dev-python/elementtree
-	dev-tcltk/tix
-	dev-python/numpy"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}
-
-pkg_setup() {
-	python_version
-}
-
-src_prepare() {
-	distutils_src_prepare
-	echo "" > "${S}"/ccpnmr2.0/c/environment.txt || die "failed to kill environment.txt"
-}
-
-src_compile() {
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		if has_version media-libs/freeglut; then
-			GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		else
-			GLUT_NEED_INIT=""
-		fi
-
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_FALSE"
-		GLUT_NOT_IN_GL=""
-		GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-		GL_DIR="/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"
-		GLUT_NOT_IN_GL=""
-		GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-	fi
-
-	cd ccpnmr2.0/c
-
-	emake \
-		CC="$(tc-getCC)" \
-		LDFLAGS="${LDFLAGGS}" \
-		MALLOC_FLAG= \
-		FPIC_FLAG="-fPIC" \
-		SHARED_FLAGS="${LDFLAGS} -shared" \
-		MATH_LIB="-lm" \
-		X11_DIR="/usr" \
-		X11_LIB="-lX11 -lXext" \
-		X11_INCLUDE_FLAGS="-I\$(X11_DIR)/include" \
-		X11_LIB_FLAGS="-L\$(X11_DIR)/lib" \
-		TCL_DIR="/usr" \
-		TCL_LIB="-ltcl${tk_ver}" \
-		TCL_INCLUDE_FLAGS="-I\$(TCL_DIR)/include" \
-		TCL_LIB_FLAGS="-L\$(TCL_DIR)/$(get_libdir)" \
-		TK_DIR="/usr" \
-		TK_LIB="-ltk${tk_ver}" \
-		TK_INCLUDE_FLAGS="-I\$(TK_DIR)/include" \
-		TK_LIB_FLAGS="-L\$(TK_DIR)/$(get_libdir)" \
-		PYTHON_DIR="/usr" \
-		PYTHON_INCLUDE_FLAGS="-I\$(PYTHON_DIR)/include/python${PYVER}" \
-		CFLAGS="${CFLAGS} \$(MALLOC_FLAG) \$(FPIC_FLAG)" \
-		GLUT_NEED_INIT="${GLUT_NEED_INIT}" \
-		IGNORE_GL_FLAG="${IGNORE_GL_FLAG}" \
-		GL_FLAG="${GL_FLAG}" \
-		GLUT_NOT_IN_GL="${GLUT_NOT_IN_GL}" \
-		GLUT_FLAG="${GLUT_FLAG}" \
-		GL_DIR="${GL_DIR}" \
-		GL_LIB="${GL_LIB}" \
-		GL_INCLUDE_FLAGS="${GL_INCLUDE_FLAGS}" \
-		GL_LIB_FLAGS="${GL_LIB_FLAGS}" \
-		all links || \
-		die "failed to compile"
-}
-
-src_install() {
-
-	local in_path
-	local gentoo_sitedir
-	local libdir
-	local files
-	local tkver
-
-	in_path=$(python_get_sitedir)/${PN}
-	gentoo_sitedir=$(python_get_sitedir)
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	for wrapper in analysis dangle dataShifter formatConverter pipe2azara; do
-		sed -e "s:gentoo_sitedir:${gentoo_sitedir}:g" \
-		    -e "s:libdir:${libdir}:g" \
-			-e "s:tkver:${tkver}:g" \
-		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	use doc && treecopy $(find . -name doc) "${D}"usr/share/doc/${PF}/html/
-
-	ebegin "Removing unneeded docs"
-	find . -name doc -exec rm -rf '{}' \; 2> /dev/null
-	eend
-
-	if [[ ${PYVER} > 2.4 ]]; then
-		for i in ccpnmr2.0/python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-			sed \
-				-e 's:#from __future__:from __future__:g' \
-				-i ${i}
-		done
-	fi
-
-	insinto ${in_path}
-
-	ebegin "Installing main files"
-	doins -r ccpnmr2.0/{data,model,python} || die "main files installation failed"
-	eend
-
-	einfo "Adjusting permissions"
-
-	files="ccpnmr/c/ContourFile.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Midge.so
-		ccp/c/StructAtom.so
-		ccp/c/StructBond.so
-		ccp/c/StructStructure.so
-		ccp/c/StructUtil.so
-		memops/c/BlockFile.so
-		memops/c/FitMethod.so
-		memops/c/GlHandler.so
-		memops/c/MemCache.so
-		memops/c/PdfHandler.so
-		memops/c/PsHandler.so
-		memops/c/ShapeFile.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_postrm() {
-	distutils_pkg_postrm
-	rm -rf $(python_get_sitedir)/${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.0-r4.ebuild b/sci-chemistry/ccpn/ccpn-2.1.0-r4.ebuild
deleted file mode 100644
index cd2a25ad7..000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.0-r4.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.5
-PYTHON_MODNAME="${PN}"
-PYTHON_USE_WITH="ssl tk"
-PATCHSET="091012"
-EAPI="2"
-
-inherit distutils portability python toolchain-funcs versionator
-
-MY_PN="${PN}mr"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="
-	http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${PV}.tar.gz
-	http://dev.gentooexperimental.org/~jlec/distfiles/update-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/elementtree
-	dev-python/numpy
-	dev-tcltk/tix
-	virtual/glut"
-DEPEND="${RDEPEND}"
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_version
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/update-${PATCHSET}.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		if has_version media-libs/freeglut; then
-			GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		else
-			GLUT_NEED_INIT=""
-		fi
-
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_FALSE"
-		GL_DIR="/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)"
-
-	sed \
-		-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:^\(GLUT_NEED_INIT = \).*:\1${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL = \).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS = \).*:\1-I\$(PYTHON_DIR)/include/python${PYVER}:g" \
-		-e "s:^\(GL_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake \
-		-C c \
-		all links || \
-		die "failed to compile"
-}
-
-src_install() {
-
-	local in_path
-	local gentoo_sitedir
-	local libdir
-	local files
-	local tkver
-
-	in_path=$(python_get_sitedir)/${PN}
-	gentoo_sitedir=$(python_get_sitedir)
-	libdir=$(get_libdir)
-	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:${gentoo_sitedir}:g" \
-		    -e "s:libdir:${libdir}:g" \
-			-e "s:tkver:${tkver}:g" \
-		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	use doc && treecopy $(find . -name doc) "${D}"usr/share/doc/${PF}/html/
-
-	ebegin "Removing unneeded docs"
-	find . -name doc -exec rm -rf '{}' \; 2> /dev/null
-	eend
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-		sed \
-			-e 's:#from __future__:from __future__:g' \
-			-i ${i}
-	done
-
-	insinto ${in_path}
-
-	ebegin "Installing main files"
-	doins -r data model python || die "main files installation failed"
-	eend
-
-	einfo "Adjusting permissions"
-
-	files="ccpnmr/c/ContourFile.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Midge.so
-		ccp/c/StructAtom.so
-		ccp/c/StructBond.so
-		ccp/c/StructStructure.so
-		ccp/c/StructUtil.so
-		memops/c/BlockFile.so
-		memops/c/FitMethod.so
-		memops/c/GlHandler.so
-		memops/c/MemCache.so
-		memops/c/PdfHandler.so
-		memops/c/PsHandler.so
-		memops/c/ShapeFile.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
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.1-r1.ebuild b/sci-chemistry/ccpn/ccpn-2.1.1-r1.ebuild
deleted file mode 100644
index 9116eaa5f..000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.5
-PYTHON_MODNAME="${PN}"
-PYTHON_USE_WITH="ssl tk"
-PATCHSET="091025"
-EAPI="2"
-
-inherit distutils portability python toolchain-funcs versionator
-
-MY_PN="${PN}mr"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="
-	http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${PV}.tar.gz
-	http://dev.gentooexperimental.org/~jlec/distfiles/update-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/elementtree
-	dev-python/numpy
-	dev-tcltk/tix
-	virtual/glut"
-DEPEND="${RDEPEND}"
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_version
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/update-${PATCHSET}.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		if has_version media-libs/freeglut; then
-			GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		else
-			GLUT_NEED_INIT=""
-		fi
-
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_FALSE"
-		GL_DIR="/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)"
-
-	sed \
-		-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:^\(GLUT_NEED_INIT = \).*:\1${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL = \).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS = \).*:\1-I\$(PYTHON_DIR)/include/python${PYVER}:g" \
-		-e "s:^\(GL_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake \
-		-C c \
-		all links || \
-		die "failed to compile"
-}
-
-src_install() {
-
-	local in_path
-	local gentoo_sitedir
-	local libdir
-	local files
-	local tkver
-
-	in_path=$(python_get_sitedir)/${PN}
-	gentoo_sitedir=$(python_get_sitedir)
-	libdir=$(get_libdir)
-	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:${gentoo_sitedir}:g" \
-		    -e "s:libdir:${libdir}:g" \
-			-e "s:tkver:${tkver}:g" \
-		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	use doc && treecopy $(find . -name doc) "${D}"usr/share/doc/${PF}/html/
-
-	ebegin "Removing unneeded docs"
-	find . -name doc -exec rm -rf '{}' \; 2> /dev/null
-	eend
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-		sed \
-			-e 's:#from __future__:from __future__:g' \
-			-i ${i}
-	done
-
-	insinto ${in_path}
-
-	ebegin "Installing main files"
-	doins -r data model python || die "main files installation failed"
-	eend
-
-	einfo "Adjusting permissions"
-
-	files="ccpnmr/c/ContourFile.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Midge.so
-		ccp/c/StructAtom.so
-		ccp/c/StructBond.so
-		ccp/c/StructStructure.so
-		ccp/c/StructUtil.so
-		memops/c/BlockFile.so
-		memops/c/FitMethod.so
-		memops/c/GlHandler.so
-		memops/c/MemCache.so
-		memops/c/PdfHandler.so
-		memops/c/PsHandler.so
-		memops/c/ShapeFile.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
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.2.1_p100129.ebuild b/sci-chemistry/ccpn/ccpn-2.1.2.1_p100129.ebuild
deleted file mode 100644
index d0387ed5e..000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.2.1_p100129.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-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*})"
-
-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.gentooexperimental.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"
-IUSE="+opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/elementtree
-	dev-python/numpy
-	dev-tcltk/tix
-	opengl? ( virtual/glut )"
-DEPEND="${RDEPEND}"
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_version
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${PATCHSET}.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_FALSE"
-		GL_DIR="/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)"
-
-	sed \
-		-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:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I\$(PYTHON_DIR)/include/python${PYVER}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake \
-		-C c \
-		all links || \
-		die "failed to compile"
-}
-
-src_install() {
-
-	local in_path
-	local gentoo_sitedir
-	local libdir
-	local files
-	local tkver
-
-	in_path=$(python_get_sitedir)/${PN}
-	gentoo_sitedir=$(python_get_sitedir)
-	libdir=$(get_libdir)
-	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:${gentoo_sitedir}:g" \
-		    -e "s:libdir:${libdir}:g" \
-			-e "s:tkver:${tkver}:g" \
-		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-		sed \
-			-e 's:#from __future__:from __future__:g' \
-			-i ${i}
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-	doins -r data model python || die "main files installation failed"
-	eend
-
-	dohtml -r doc/* || die
-	dosym ../../../../share/doc/${PF}/html ${in_path}/doc || die
-
-	einfo "Adjusting permissions"
-
-	files="ccpnmr/c/ContourFile.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Midge.so
-		ccp/c/StructAtom.so
-		ccp/c/StructBond.so
-		ccp/c/StructStructure.so
-		ccp/c/StructUtil.so
-		memops/c/BlockFile.so
-		memops/c/FitMethod.so
-		memops/c/GlHandler.so
-		memops/c/MemCache.so
-		memops/c/PdfHandler.so
-		memops/c/PsHandler.so
-		memops/c/ShapeFile.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_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.2.1_p100124.ebuild b/sci-chemistry/ccpn/ccpn-2.1.2.1_p100204.ebuild
index d0387ed5e..d0387ed5e 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.2.1_p100124.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.2.1_p100204.ebuild
diff --git a/sci-chemistry/ccpn/ccpn-2.1.2_p1-r3.ebuild b/sci-chemistry/ccpn/ccpn-2.1.2_p1-r3.ebuild
deleted file mode 100644
index 2f1d0394c..000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.2_p1-r3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.5
-PYTHON_MODNAME="${PN}"
-PYTHON_USE_WITH="ssl tk"
-PATCHSET=""
-EAPI="2"
-
-inherit distutils portability python toolchain-funcs versionator
-
-MY_PN="${PN}mr"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${PV/p/}.tar.gz"
-[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentooexperimental.org/~jlec/distfiles/update-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="+opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/elementtree
-	dev-python/numpy
-	dev-tcltk/tix
-	opengl? ( virtual/glut )"
-DEPEND="${RDEPEND}"
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_version
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/update-${PATCHSET}.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_FALSE"
-		GL_DIR="/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)"
-
-	sed \
-		-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:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I\$(PYTHON_DIR)/include/python${PYVER}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake \
-		-C c \
-		all links || \
-		die "failed to compile"
-}
-
-src_install() {
-
-	local in_path
-	local gentoo_sitedir
-	local libdir
-	local files
-	local tkver
-
-	in_path=$(python_get_sitedir)/${PN}
-	gentoo_sitedir=$(python_get_sitedir)
-	libdir=$(get_libdir)
-	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:${gentoo_sitedir}:g" \
-		    -e "s:libdir:${libdir}:g" \
-			-e "s:tkver:${tkver}:g" \
-		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-		sed \
-			-e 's:#from __future__:from __future__:g' \
-			-i ${i}
-	done
-
-	insinto ${in_path}
-
-	ebegin "Installing main files"
-	doins -r data model python || die "main files installation failed"
-	eend
-
-	dohtml -r doc/* || die
-	dosym ../../../../share/doc/${PF}/html ${in_path}/doc || die
-
-	einfo "Adjusting permissions"
-
-	files="ccpnmr/c/ContourFile.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Midge.so
-		ccp/c/StructAtom.so
-		ccp/c/StructBond.so
-		ccp/c/StructStructure.so
-		ccp/c/StructUtil.so
-		memops/c/BlockFile.so
-		memops/c/FitMethod.so
-		memops/c/GlHandler.so
-		memops/c/MemCache.so
-		memops/c/PdfHandler.so
-		memops/c/PsHandler.so
-		memops/c/ShapeFile.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
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.2_p1-r4.ebuild b/sci-chemistry/ccpn/ccpn-2.1.2_p1-r4.ebuild
deleted file mode 100644
index eb6860ea8..000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.2_p1-r4.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.5
-PYTHON_MODNAME="${PN}"
-PYTHON_USE_WITH="ssl tk"
-PATCHSET="091220"
-EAPI="2"
-
-inherit distutils portability python toolchain-funcs versionator
-
-MY_PN="${PN}mr"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${PV/p/}.tar.gz"
-[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentooexperimental.org/~jlec/distfiles/update-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="+opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/elementtree
-	dev-python/numpy
-	dev-tcltk/tix
-	opengl? ( virtual/glut )"
-DEPEND="${RDEPEND}"
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_version
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/update-${PATCHSET}.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_FALSE"
-		GL_DIR="/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)"
-
-	sed \
-		-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:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I\$(PYTHON_DIR)/include/python${PYVER}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake \
-		-C c \
-		all links || \
-		die "failed to compile"
-}
-
-src_install() {
-
-	local in_path
-	local gentoo_sitedir
-	local libdir
-	local files
-	local tkver
-
-	in_path=$(python_get_sitedir)/${PN}
-	gentoo_sitedir=$(python_get_sitedir)
-	libdir=$(get_libdir)
-	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:${gentoo_sitedir}:g" \
-		    -e "s:libdir:${libdir}:g" \
-			-e "s:tkver:${tkver}:g" \
-		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-		sed \
-			-e 's:#from __future__:from __future__:g' \
-			-i ${i}
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-	doins -r data model python || die "main files installation failed"
-	eend
-
-	dohtml -r doc/* || die
-	dosym ../../../../share/doc/${PF}/html ${in_path}/doc || die
-
-	einfo "Adjusting permissions"
-
-	files="ccpnmr/c/ContourFile.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Midge.so
-		ccp/c/StructAtom.so
-		ccp/c/StructBond.so
-		ccp/c/StructStructure.so
-		ccp/c/StructUtil.so
-		memops/c/BlockFile.so
-		memops/c/FitMethod.so
-		memops/c/GlHandler.so
-		memops/c/MemCache.so
-		memops/c/PdfHandler.so
-		memops/c/PsHandler.so
-		memops/c/ShapeFile.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
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.2_p1-r5.ebuild b/sci-chemistry/ccpn/ccpn-2.1.2_p1-r5.ebuild
deleted file mode 100644
index a4f45cd92..000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.2_p1-r5.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-PYTHON_USE_WITH="ssl tk"
-PATCHSET="091220"
-
-inherit eutils portability python toolchain-funcs versionator
-
-MY_PN="${PN}mr"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${PV/p/}.tar.gz"
-[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentooexperimental.org/~jlec/distfiles/update-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="+opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/elementtree
-	dev-python/numpy
-	dev-tcltk/tix
-	opengl? ( virtual/glut )"
-DEPEND="${RDEPEND}"
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_version
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/update-${PATCHSET}.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_FALSE"
-		GL_DIR="/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)"
-
-	sed \
-		-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:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I\$(PYTHON_DIR)/include/python${PYVER}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake \
-		-C c \
-		all links || \
-		die "failed to compile"
-}
-
-src_install() {
-
-	local in_path
-	local gentoo_sitedir
-	local libdir
-	local files
-	local tkver
-
-	in_path=$(python_get_sitedir)/${PN}
-	gentoo_sitedir=$(python_get_sitedir)
-	libdir=$(get_libdir)
-	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:${gentoo_sitedir}:g" \
-		    -e "s:libdir:${libdir}:g" \
-			-e "s:tkver:${tkver}:g" \
-		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-		sed \
-			-e 's:#from __future__:from __future__:g' \
-			-i ${i}
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-	doins -r data model python || die "main files installation failed"
-	eend
-
-	dohtml -r doc/* || die
-	dosym ../../../../share/doc/${PF}/html ${in_path}/doc || die
-
-	einfo "Adjusting permissions"
-
-	files="ccpnmr/c/ContourFile.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Midge.so
-		ccp/c/StructAtom.so
-		ccp/c/StructBond.so
-		ccp/c/StructStructure.so
-		ccp/c/StructUtil.so
-		memops/c/BlockFile.so
-		memops/c/FitMethod.so
-		memops/c/GlHandler.so
-		memops/c/MemCache.so
-		memops/c/PdfHandler.so
-		memops/c/PsHandler.so
-		memops/c/ShapeFile.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_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.2_p1-r6.ebuild b/sci-chemistry/ccpn/ccpn-2.1.2_p1-r6.ebuild
deleted file mode 100644
index a08cac736..000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.2_p1-r6.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-PYTHON_USE_WITH="ssl tk"
-PATCHSET="100116"
-
-inherit eutils portability python toolchain-funcs versionator
-
-MY_PN="${PN}mr"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${PV/p/}.tar.gz"
-[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentooexperimental.org/~jlec/distfiles/update-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="+opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/elementtree
-	dev-python/numpy
-	dev-tcltk/tix
-	opengl? ( virtual/glut )"
-DEPEND="${RDEPEND}"
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_version
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/update-${PATCHSET}.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_FALSE"
-		GL_DIR="/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)"
-
-	sed \
-		-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:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I\$(PYTHON_DIR)/include/python${PYVER}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake \
-		-C c \
-		all links || \
-		die "failed to compile"
-}
-
-src_install() {
-
-	local in_path
-	local gentoo_sitedir
-	local libdir
-	local files
-	local tkver
-
-	in_path=$(python_get_sitedir)/${PN}
-	gentoo_sitedir=$(python_get_sitedir)
-	libdir=$(get_libdir)
-	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:${gentoo_sitedir}:g" \
-		    -e "s:libdir:${libdir}:g" \
-			-e "s:tkver:${tkver}:g" \
-		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-		sed \
-			-e 's:#from __future__:from __future__:g' \
-			-i ${i}
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-	doins -r data model python || die "main files installation failed"
-	eend
-
-	dohtml -r doc/* || die
-	dosym ../../../../share/doc/${PF}/html ${in_path}/doc || die
-
-	einfo "Adjusting permissions"
-
-	files="ccpnmr/c/ContourFile.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Midge.so
-		ccp/c/StructAtom.so
-		ccp/c/StructBond.so
-		ccp/c/StructStructure.so
-		ccp/c/StructUtil.so
-		memops/c/BlockFile.so
-		memops/c/FitMethod.so
-		memops/c/GlHandler.so
-		memops/c/MemCache.so
-		memops/c/PdfHandler.so
-		memops/c/PsHandler.so
-		memops/c/ShapeFile.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_need_rebuild
-	python_mod_optimize $(python_get_sitedir)/${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_sitedir)/${PN}
-}