Version Bump, cleaned old versions

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

11 files changed, 24 insertions, 1472 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 474d182f67fb..d02e1a634955 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-chemistry/ccpn
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.25 2010/04/15 10:11:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.26 2010/04/23 06:03:56 jlec Exp $
+
+*ccpn-2.1.3.1_p100422 (22 Apr 2010)
+
+  22 Apr 2010; Justin Lecher <jlec@gentoo.org> -ccpn-2.1.3.1_p100308.ebuild,
+  -ccpn-2.1.3.1_p100311.ebuild, -ccpn-2.1.3.1_p100312.ebuild,
+  -ccpn-2.1.3.1_p100313.ebuild, -ccpn-2.1.3.1_p100318.ebuild,
+  -ccpn-2.1.3.1_p100318-r1.ebuild, -ccpn-2.1.3.1_p100326.ebuild,
+  -ccpn-2.1.3.1_p100327.ebuild, -ccpn-2.1.3.1_p100330.ebuild,
+  +ccpn-2.1.3.1_p100422.ebuild:
+  Todays python patches, removed old versions
 
 *ccpn-2.1.3.1_p100415 (15 Apr 2010)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index c818c0367ad7..7aa425f9c441 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -16,38 +16,23 @@ DIST analysis2.1.2_1.tar.gz 19227793 RMD160 f633a8338e3fbb9d8ad77c9482d63191419b
 DIST analysis2.1.3.tar.gz 18917835 RMD160 068fed988cb20d899266680f7dd7af2ca1ae2b46 SHA1 51d54036775cc271251c9deaf112903296db19e6 SHA256 6e614d0ab7d4ccaed9d5e0401f25a821c81def4bda28e1426f4112c521031e47
 DIST analysis2.1.3_1.tar.gz 18932918 RMD160 5f19ea6fe47c2910d16fcba8d1a78f0e1dead731 SHA1 683bdfb17d14979eb6477aaa99e4c4af5003beb2 SHA256 bbc1ba5434f896d38b6745c1dc9adc470a78d3be7b879160edcd635a19228b74
 DIST ccpn-update-100216.patch.bz2 37914 RMD160 92d2845f9a21a5ddc9fd71cf56928b61f497530c SHA1 de61701435675d10165826cf4cd590dca336cbb2 SHA256 13e062188e953ea62e779b7d89004ce103db61daf228cf6b9f7d3c77f39947fc
-DIST ccpn-update-100308.patch.bz2 30914 RMD160 5540c49a7e362f464dcc774431234490b6d7082b SHA1 ff72c1ace15c192779c2e59e27fca6944d696429 SHA256 25d9ee427f909cad0f19233963f19494649ed9c761005175d447bc4cd5e6907c
-DIST ccpn-update-100311.patch.bz2 36925 RMD160 14e56026fa309b4011276dd07eee4c1292432ded SHA1 c505d95ffbb7af15fc906a2de14c572850e4ec00 SHA256 f0c3a1c48787097463491024ce31b410b984c2fd968371244e5f66d1c37f5c31
-DIST ccpn-update-100312.patch.bz2 37664 RMD160 ea0acb9ce906c1d3cd5578f35e514fb3cfa99ff6 SHA1 43a1cc93403744281a2d65c7d2e0c62ba4bf8df8 SHA256 4b9402cb46bfd23c2d832a9434d8fa597de1e82863d1516b4ee086aecac6a917
-DIST ccpn-update-100313.patch.bz2 39565 RMD160 115db3a3692cdf4f8b350eb024b22bc393d1855d SHA1 eb5fdde9b10eb1809732d2ef89c5c0aa08285cdd SHA256 79e15dcf5c7bc275fafea2edaa9abb62bbb2bf23b5210aef64a0601847ce0a75
-DIST ccpn-update-100318.patch.bz2 48906 RMD160 41a17709c807e4ae1a7a5145c2dca9ba09a80f4d SHA1 b99002dfd2fc9eb85a4c88f580aa8f1675fb8063 SHA256 dffcb3617238d10bc373be9a91afe8f8d77879d26e40d09a52b052472c20b735
-DIST ccpn-update-100326.patch.bz2 80654 RMD160 b42fe6eef14d8384e78a091f2fce6c53c910a410 SHA1 27f723753850b2f3d2bf3ae11aa5db3bda1294b4 SHA256 069c3ec93b7affafc8334e42fbd5f0b1f1a4bb916f7dad6fc3f4faa6e12d7c7d
-DIST ccpn-update-100327.patch.bz2 81747 RMD160 ca6f704988f89caff0efaa69feac1c4e49c37c7a SHA1 52efe36493da8792addfa84375d96dae0d368ab2 SHA256 b4e3b80c2e29ea7d28b695ab5650de5f3098a2cf01faf3fa9caea57e52de9f74
-DIST ccpn-update-100330.patch.bz2 84490 RMD160 82a11b95cdf933b385c1554f3360bced5a26c43a SHA1 146e2243e9855ff43c22dcdb15bc1e7404f834a0 SHA256 a01f1c9396d05ba13da2d04fb7c670d1cbad6d3369afcc4b6b03e9c00b170e5e
 DIST ccpn-update-100406.patch.bz2 87475 RMD160 2a4e27ba091d53cf5728e3ed94a16c46f68ed85b SHA1 7dbd539a22a304428b6f2e2d44d58a2e8e4551d1 SHA256 3d5f49509fa8ee3bc8f91176d9338855526bc580e73d62fa2b7140c12502a38a
 DIST ccpn-update-100409.patch.bz2 96373 RMD160 a3df9d973c50762fd32e4c66d2776fea34ed3a2c SHA1 2e6d7ca27d21907334ca81ef2a85950916de2ff1 SHA256 61209c9e5381ed56ae037416c6b2346219d2ff782c86c2fd51acf4fccc925df5
 DIST ccpn-update-100415.patch.bz2 113550 RMD160 69a0e5a35148422d737c1c6bedb4f8c5aee1384b SHA1 0470e2dce27fee111a4e52253b9fb882df037170 SHA256 531e9a8a9adb08f4f64d902a9269a06b65cf431dec00c5b2b5f49b9e12dbc5eb
+DIST ccpn-update-100422.patch.bz2 128073 RMD160 7ea8a1eef17399274d319b5b8f1e4e2035a7cb4e SHA1 dcf74f667b5a34a93306da78d370396e0950c86e SHA256 5d0e0adfbf9efdf598ec7dd62059f08d7ace8f41799558c18105054599cf56df
 EBUILD ccpn-2.1.2.1_p100216.ebuild 4880 RMD160 e892baef0d74df30f40e5b393c893159bd08dda5 SHA1 e1a7a09588aa2f4e341e5d94f5260072dab10474 SHA256 7777534b663f05898cf40cc1f7114b2a6de38343fe5ab31f14d4c4c4f2456c47
 EBUILD ccpn-2.1.3.1.ebuild 4977 RMD160 12969caf3118f10fd0bd794f58d31be3e5c60c03 SHA1 dcdd685d5321ed97ea821fa6799e35d9b287e9dd SHA256 b55eb637a743dd0ad6c1a31b623c1c814019dcfc45f734996d3dec34a0ab5033
-EBUILD ccpn-2.1.3.1_p100308.ebuild 4968 RMD160 55570e8d965a301270dfbbeb525127c06a2fb13d SHA1 2e33e0da5337ff7fe2fcaf5f6c0cc0f0471714b9 SHA256 59fdc2733014cc89eaed8b3fe3692bfa1153d4697216b558c961ca6906a1f448
-EBUILD ccpn-2.1.3.1_p100311.ebuild 4968 RMD160 4c28a74b04553b04bc23bc42061f6d90e260706d SHA1 9c660041c87d58046f0e464e1eb5621903cae0c1 SHA256 ef119ae533ec22f55dd2a7cd440a47829715833b792f217ec665358580912761
-EBUILD ccpn-2.1.3.1_p100312.ebuild 4968 RMD160 06dc5d340a5a6cbbc16fe796b293de1117b1f96e SHA1 ea99f4e1433ca2b007ae805d2c5ff22ca677fd3e SHA256 b78534f7ed6830d83c0f4d01d3fb3744fdb8c314f4fc3625bbe02471c69da964
-EBUILD ccpn-2.1.3.1_p100313.ebuild 4968 RMD160 d30df1e9625a939f7e1f87e37147ce669aa09c84 SHA1 2097a6b3c9a918e950c01a01c0ca42a90b7eb689 SHA256 119278b8f15da0af19b794c5b6ac06e49e2ff4e58e0a40831b47f94061ba6a25
-EBUILD ccpn-2.1.3.1_p100318-r1.ebuild 4971 RMD160 0c2b6a132a9cb49b27c40130c60aa4c2db98c4e6 SHA1 28777121022e98378462468c31198f110555d059 SHA256 6cfe73319d9aa1758947df1f939136b9fa583cb35102d00ff017229076f9154e
-EBUILD ccpn-2.1.3.1_p100318.ebuild 4968 RMD160 fa68d224867dbf6449dbc00ad4f20fb8506570f8 SHA1 f022717dfbac4572490c38e28c9eeb5c480b9e41 SHA256 6385f414e90d3b79c565c8f650c123c123bd9c91b8dd00dc0b1061a985758fd2
-EBUILD ccpn-2.1.3.1_p100326.ebuild 4968 RMD160 2eee20a6e09949096b82d7ebe2844e7d75a358b5 SHA1 c5e3fb5539942e5f9cf9fa778e71f9085f89e545 SHA256 48827cac002bb1089db5b90930d54301a2fb6588460923583d0f08f4b8603a55
-EBUILD ccpn-2.1.3.1_p100327.ebuild 4968 RMD160 53bf882645e2d43f36eaa1b3ac1cc92c925693d4 SHA1 558e2ad76c2532ca829acceb024000a326dd1f37 SHA256 8ad862f5854757144ced77da479b15b67ff826a83082362219a1a288ce6bb3c9
-EBUILD ccpn-2.1.3.1_p100330.ebuild 4968 RMD160 bf9ac39e2530b2a133f499c9051fa84b7a9e12ec SHA1 73e12b3699514e5184a5b858611e0d7b6b5497a6 SHA256 a0efbcade813353ff33f049d9b841a47d9e978136a74cacd66f7e64cb29cb685
 EBUILD ccpn-2.1.3.1_p100406.ebuild 5137 RMD160 4a85d2bb2e72679703beaff9eb013b3128257f1a SHA1 f7e173650d1370a7540354f1286142ddf9483267 SHA256 463d86bbafa1c0ec3f3b1be1bd9a7208690aff4d14545f85a03002116dfec9e7
 EBUILD ccpn-2.1.3.1_p100409.ebuild 5137 RMD160 b55196251759b32a75411e1ba35c97bb5c37bbbf SHA1 123e91b8bee4410fb057fee3706f7bc4e6900999 SHA256 08da3ae56257de82169a0ddbe83b52ba5211baeed02ab50d49c0cbbda259ef9a
 EBUILD ccpn-2.1.3.1_p100415.ebuild 5137 RMD160 0e48c778dd240ee11e6a3e24240f70eab46c336d SHA1 d0da0fae312615ea4be3b2dbfcc9115fd27a20bc SHA256 239e090627b916daf0e5907257757374e1bdd755cfa1226f54faad78bc6f749f
+EBUILD ccpn-2.1.3.1_p100422.ebuild 5137 RMD160 39be1eb0efad80b6a18e2e8c4cf2d9599fbe52f7 SHA1 88fd579646901b2df8bdb9966aa98aa1cdedb3e7 SHA256 7fad431ef79ec60b520a29306cad9bd9807c05553c6bb8f1d4b589c7cce71b1c
 EBUILD ccpn-2.1.3.ebuild 4975 RMD160 99530170d2323e58cd105a5a8e47c493d0fd765c SHA1 5c298bffe292915768357e8273a1fb3d05312fb3 SHA256 1f9701c42f9e9754f0d8dcb258e3e365ec31f4e8d99b5649376083b7ff87bbb9
-MISC ChangeLog 4326 RMD160 fa1e114c4d5b8c3766a178ebf8690c1c2e0695a7 SHA1 d5defbf5921c44126c05fe4085ada1a5b5d3462d SHA256 ee7bc882e82522c7af79cb390f1d966246d191f32147c3f325b90f68bfabf837
+MISC ChangeLog 4770 RMD160 e3eb06d3503a6ee27b98cfe8721e270169c58a93 SHA1 669f7eb2d8cf94a9a872caf39c19ffd4120acee0 SHA256 a9f40674c751b0900daba5852aee14316eceb035fb53704d58a87dd5bea7a5e6
 MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvG5j4ACgkQgAnW8HDreRbgPACfdZUPjgPt3ZxMn41Ziz3F9elP
-V4sAn3dpZFm3++lh9MXO48kU5SSzl88W
-=49AV
+iEYEARECAAYFAkvROFIACgkQgAnW8HDreRbDeACgnJRxf43jBZzWj2Di0Ro3LwQa
+NIAAn3/QWFgbgoXLShse5pVj44wUd9qj
+=/Wu3
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100311.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100311.ebuild
deleted file mode 100644
index 9978723c06b1..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100311.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2010 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_p100311.ebuild,v 1.1 2010/03/11 08:17:02 jlec Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-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.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="+opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/numpy
-	dev-tcltk/tix
-	opengl? ( virtual/glut )"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-RESTRICT="mirror"
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-	epatch "${FILESDIR}"/${MY_PV}-dynamics.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="${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)"
-
-	python_copy_sources
-
-	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:^\(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:^\(GL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-			c/environment_default.txt > c/environment.txt
-	}
-	python_execute_function -s preparation
-}
-
-src_compile() {
-	building() {
-		emake -C c all links
-	}
-	python_execute_function -s building
-}
-
-src_install() {
-	local libdir
-	local tkver
-
-	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:${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
-
-	installation() {
-		local in_path
-		local files
-
-		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}
-		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
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100312.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100312.ebuild
deleted file mode 100644
index 98294980fe88..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100312.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2010 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_p100312.ebuild,v 1.1 2010/03/12 08:24:10 jlec Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-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.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="+opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/numpy
-	dev-tcltk/tix
-	opengl? ( virtual/glut )"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-RESTRICT="mirror"
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-	epatch "${FILESDIR}"/${MY_PV}-dynamics.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="${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)"
-
-	python_copy_sources
-
-	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:^\(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:^\(GL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-			c/environment_default.txt > c/environment.txt
-	}
-	python_execute_function -s preparation
-}
-
-src_compile() {
-	building() {
-		emake -C c all links
-	}
-	python_execute_function -s building
-}
-
-src_install() {
-	local libdir
-	local tkver
-
-	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:${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
-
-	installation() {
-		local in_path
-		local files
-
-		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}
-		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
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100313.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100313.ebuild
deleted file mode 100644
index 288f8149763a..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100313.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2010 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_p100313.ebuild,v 1.1 2010/03/13 13:26:39 jlec Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-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.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="+opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/numpy
-	dev-tcltk/tix
-	opengl? ( virtual/glut )"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-RESTRICT="mirror"
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-	epatch "${FILESDIR}"/${MY_PV}-dynamics.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="${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)"
-
-	python_copy_sources
-
-	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:^\(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:^\(GL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-			c/environment_default.txt > c/environment.txt
-	}
-	python_execute_function -s preparation
-}
-
-src_compile() {
-	building() {
-		emake -C c all links
-	}
-	python_execute_function -s building
-}
-
-src_install() {
-	local libdir
-	local tkver
-
-	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:${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
-
-	installation() {
-		local in_path
-		local files
-
-		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}
-		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
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100318-r1.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100318-r1.ebuild
deleted file mode 100644
index ded475009f63..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100318-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2010 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_p100318-r1.ebuild,v 1.1 2010/03/18 19:29:33 jlec Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-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.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="+opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/numpy
-	dev-tcltk/tix
-	opengl? ( virtual/glut )"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-RESTRICT="mirror"
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-	epatch "${FILESDIR}"/${MY_PV}-dynamics.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="${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)"
-
-	python_copy_sources
-
-	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:^\(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:^\(GL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-			c/environment_default.txt > c/environment.txt
-	}
-	python_execute_function -s preparation
-}
-
-src_compile() {
-	building() {
-		emake -C c all links
-	}
-	python_execute_function -s building
-}
-
-src_install() {
-	local libdir
-	local tkver
-
-	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:${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
-
-	installation() {
-		local in_path
-		local files
-
-		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}
-		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
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100318.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100318.ebuild
deleted file mode 100644
index 18b95ee4c58b..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100318.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2010 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_p100318.ebuild,v 1.1 2010/03/18 08:01:55 jlec Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-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.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="+opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/numpy
-	dev-tcltk/tix
-	opengl? ( virtual/glut )"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-RESTRICT="mirror"
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-	epatch "${FILESDIR}"/${MY_PV}-dynamics.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="${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)"
-
-	python_copy_sources
-
-	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:^\(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:^\(GL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-			c/environment_default.txt > c/environment.txt
-	}
-	python_execute_function -s preparation
-}
-
-src_compile() {
-	building() {
-		emake -C c all links
-	}
-	python_execute_function -s building
-}
-
-src_install() {
-	local libdir
-	local tkver
-
-	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:${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
-
-	installation() {
-		local in_path
-		local files
-
-		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}
-		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
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100326.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100326.ebuild
deleted file mode 100644
index da5baf696256..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100326.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2010 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_p100326.ebuild,v 1.1 2010/03/26 11:20:20 jlec Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-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.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="+opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/numpy
-	dev-tcltk/tix
-	opengl? ( virtual/glut )"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-RESTRICT="mirror"
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-	epatch "${FILESDIR}"/${MY_PV}-dynamics.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="${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)"
-
-	python_copy_sources
-
-	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:^\(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:^\(GL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-			c/environment_default.txt > c/environment.txt
-	}
-	python_execute_function -s preparation
-}
-
-src_compile() {
-	building() {
-		emake -C c all links
-	}
-	python_execute_function -s building
-}
-
-src_install() {
-	local libdir
-	local tkver
-
-	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:${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
-
-	installation() {
-		local in_path
-		local files
-
-		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}
-		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
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100327.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100327.ebuild
deleted file mode 100644
index 5b5f6e4cff63..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100327.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2010 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_p100327.ebuild,v 1.1 2010/03/27 08:04:22 jlec Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-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.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="+opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/numpy
-	dev-tcltk/tix
-	opengl? ( virtual/glut )"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-RESTRICT="mirror"
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-	epatch "${FILESDIR}"/${MY_PV}-dynamics.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="${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)"
-
-	python_copy_sources
-
-	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:^\(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:^\(GL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-			c/environment_default.txt > c/environment.txt
-	}
-	python_execute_function -s preparation
-}
-
-src_compile() {
-	building() {
-		emake -C c all links
-	}
-	python_execute_function -s building
-}
-
-src_install() {
-	local libdir
-	local tkver
-
-	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:${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
-
-	installation() {
-		local in_path
-		local files
-
-		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}
-		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
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100330.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100330.ebuild
deleted file mode 100644
index 7c647dd39e99..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100330.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2010 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_p100330.ebuild,v 1.1 2010/03/30 10:00:50 jlec Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-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.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="+opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/numpy
-	dev-tcltk/tix
-	opengl? ( virtual/glut )"
-DEPEND="${RDEPEND}"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-RESTRICT="mirror"
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-	epatch "${FILESDIR}"/${MY_PV}-dynamics.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="${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)"
-
-	python_copy_sources
-
-	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:^\(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:^\(GL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-			c/environment_default.txt > c/environment.txt
-	}
-	python_execute_function -s preparation
-}
-
-src_compile() {
-	building() {
-		emake -C c all links
-	}
-	python_execute_function -s building
-}
-
-src_install() {
-	local libdir
-	local tkver
-
-	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:${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
-
-	installation() {
-		local in_path
-		local files
-
-		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}
-		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
-	}
-	python_execute_function -s installation
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100308.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100422.ebuild
index ee352789df38..5964ee25e295 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100308.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100422.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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_p100308.ebuild,v 1.1 2010/03/08 21:20:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100422.ebuild,v 1.1 2010/04/23 06:03:56 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -27,6 +27,8 @@ RDEPEND="
 	dev-lang/tk
 	dev-python/numpy
 	dev-tcltk/tix
+	x11-libs/libXext
+	x11-libs/libX11
 	opengl? ( virtual/glut )"
 DEPEND="${RDEPEND}"
 RESTRICT_PYTHON_ABIS="2.4 3.*"
@@ -73,6 +75,10 @@ src_prepare() {
 			-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" \
@@ -80,7 +86,6 @@ src_prepare() {
 			-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:^\(GL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
 			c/environment_default.txt > c/environment.txt
 	}
 	python_execute_function -s preparation