Cleaned old, python patches, fixed sed strings

(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

21 files changed, 150 insertions, 3116 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index d11bd97b0e1c..1d46109d4327 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for sci-chemistry/ccpn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.64 2011/06/02 07:36:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.65 2011/06/29 05:51:28 jlec Exp $
+
+*ccpn-2.2.1_p110629 (29 Jun 2011)
+*ccpn-2.1.5_p110629 (29 Jun 2011)
+
+  29 Jun 2011; Justin Lecher <jlec@gentoo.org> ccpn-2.1.3.1_p100806.ebuild,
+  -ccpn-2.1.5_p110202.ebuild, -ccpn-2.1.5_p110217.ebuild,
+  -ccpn-2.1.5_p110222.ebuild, -ccpn-2.1.5_p110226.ebuild,
+  -ccpn-2.1.5_p110308.ebuild, -ccpn-2.1.5_p110401.ebuild,
+  -ccpn-2.1.5_p110505.ebuild, -ccpn-2.1.5_p110526.ebuild,
+  -ccpn-2.1.5_p110527.ebuild, ccpn-2.1.5_p110602.ebuild,
+  +ccpn-2.1.5_p110629.ebuild, -ccpn-2.2.1_p110222.ebuild,
+  -ccpn-2.2.1_p110226.ebuild, -ccpn-2.2.1_p110308.ebuild,
+  -ccpn-2.2.1_p110401.ebuild, -ccpn-2.2.1_p110505.ebuild,
+  -ccpn-2.2.1_p110526.ebuild, -ccpn-2.2.1_p110527.ebuild,
+  ccpn-2.2.1_p110602.ebuild, +ccpn-2.2.1_p110629.ebuild, metadata.xml:
+  Cleaned old, python patches, fixed sed strings
 
 *ccpn-2.2.1_p110602 (02 Jun 2011)
 *ccpn-2.1.5_p110602 (02 Jun 2011)
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild
index 0928cf987763..c81ae201d6a7 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild,v 1.3 2010/09/30 20:04:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild,v 1.4 2011/06/29 05:51:28 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -70,23 +70,23 @@ src_prepare() {
 
 	preparation() {
 		sed \
-			-e "s:/usr:${EPREFIX}/usr:g" \
-			-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-			-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-			-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-			-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-			-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-			-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-			-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-			-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-			-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-			-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-			-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-			-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-			-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-			-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-			-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I\$(PYTHON_DIR)/include/python$(python_get_version):g" \
-			-e "s:^\(PYTHON_LIB =\).*:\1 -lpython$(python_get_version):g" \
+			-e "s|/usr|${EPREFIX}/usr|g" \
+			-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+			-e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
+			-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
+			-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
+			-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
+			-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
+			-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
+			-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
+			-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
+			-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
+			-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
+			-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+			-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+			-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+			-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I\$(PYTHON_DIR)/include/python$(python_get_version)|g" \
+			-e "s|^\(PYTHON_LIB =\).*|\1 -lpython$(python_get_version)|g" \
 			c/environment_default.txt > c/environment.txt
 	}
 	python_execute_function -s preparation
@@ -107,11 +107,11 @@ src_install() {
 	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
 
 	for wrapper in analysis dangle dataShifter eci formatConverter pipe2azara; do
-		sed -e "s:gentoo_sitedir:${EPREFIX}/$(python_get_sitedir -f):g" \
-		    -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
+		sed -e "s|gentoo_sitedir|${EPREFIX}/$(python_get_sitedir -f)|g" \
+		    -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
+			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
+			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
+			-e "s|gentoopython|${EPREFIX}/usr/bin/python|g" \
 		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
 		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
 	done
@@ -124,7 +124,7 @@ src_install() {
 
 		for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
 			sed \
-				-e 's:#from __future__:from __future__:g' \
+				-e 's|#from __future__|from __future__|g' \
 				-i ${i}
 		done
 
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110202.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110202.ebuild
deleted file mode 100644
index 69a008238996..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110202.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110202.ebuild,v 1.1 2011/02/02 17:18:02 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110217.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110217.ebuild
deleted file mode 100644
index f29781f7beb6..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110217.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110217.ebuild,v 1.1 2011/02/17 11:39:12 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110222.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110222.ebuild
deleted file mode 100644
index 80608cf7391d..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110222.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110222.ebuild,v 1.1 2011/02/22 10:35:38 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110226.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110226.ebuild
deleted file mode 100644
index 71ba615e8a61..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110226.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110226.ebuild,v 1.1 2011/02/26 11:06:34 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110401.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110401.ebuild
deleted file mode 100644
index 6189b6ac9723..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110401.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110401.ebuild,v 1.1 2011/04/01 10:35:38 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110505.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110505.ebuild
deleted file mode 100644
index c6fcc9cba2c2..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110505.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110505.ebuild,v 1.1 2011/05/05 10:57:00 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110526.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110526.ebuild
deleted file mode 100644
index 8e0255f16ff0..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110526.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110526.ebuild,v 1.1 2011/05/26 09:37:35 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110527.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110527.ebuild
deleted file mode 100644
index 28fee2bb741e..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110527.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110527.ebuild,v 1.1 2011/05/27 10:28:55 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110602.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110602.ebuild
index 181c61bef7e3..4c1b27ce2c01 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110602.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.5_p110602.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110602.ebuild,v 1.1 2011/06/02 07:36:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110602.ebuild,v 1.2 2011/06/29 05:51:28 jlec Exp $
 
 EAPI="3"
 
@@ -81,23 +81,23 @@ src_prepare() {
 	rm -rf data model doc license || die
 
 	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
+		-e "s|/usr|${EPREFIX}/usr|g" \
+		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+		-e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
+		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
+		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
+		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
+		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
+		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
+		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
+		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
+		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
+		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
+		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
+		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
 		c/environment_default.txt > c/environment.txt
 }
 
@@ -119,12 +119,12 @@ src_install() {
 	use extendnmr && _wrapper="${_wrapper} extendNmr"
 	for wrapper in ${_wrapper}; do
 		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
+			-e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|g" \
+		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
+			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
+			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
+			-e "s|gentoopython|${EPREFIX}/usr/bin/python|g" \
+			-e "s|//|/|g" \
 			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
 		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
 	done
@@ -140,7 +140,7 @@ src_install() {
 
 	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
 	sed \
-		-e 's:#from __future__:from __future__:g' \
+		-e 's|#from __future__|from __future__|g' \
 		-i ${i} || die
 	done
 
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110308.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110629.ebuild
index 585b43ac4d92..17f9370f1189 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110308.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.5_p110629.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110308.ebuild,v 1.1 2011/03/08 06:21:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110629.ebuild,v 1.1 2011/06/29 05:51:28 jlec Exp $
 
 EAPI="3"
 
@@ -15,9 +15,9 @@ MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
 MY_MAJOR="$(get_version_component_range 1-3)"
 
 DESCRIPTION="The Collaborative Computing Project for NMR"
+HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
 SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
 	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
 
 SLOT="0"
 LICENSE="|| ( CCPN LGPL-2.1 )"
@@ -81,23 +81,23 @@ src_prepare() {
 	rm -rf data model doc license || die
 
 	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
+		-e "s|/usr|${EPREFIX}/usr|g" \
+		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+		-e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
+		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
+		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
+		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
+		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
+		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
+		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
+		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
+		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
+		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
+		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
+		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
 		c/environment_default.txt > c/environment.txt
 }
 
@@ -119,12 +119,12 @@ src_install() {
 	use extendnmr && _wrapper="${_wrapper} extendNmr"
 	for wrapper in ${_wrapper}; do
 		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
+			-e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|g" \
+		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
+			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
+			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
+			-e "s|gentoopython|${EPREFIX}/usr/bin/python|g" \
+			-e "s|//|/|g" \
 			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
 		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
 	done
@@ -140,7 +140,7 @@ src_install() {
 
 	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
 	sed \
-		-e 's:#from __future__:from __future__:g' \
+		-e 's|#from __future__|from __future__|g' \
 		-i ${i} || die
 	done
 
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110226.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110226.ebuild
deleted file mode 100644
index c8918359f2a8..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110226.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110226.ebuild,v 1.1 2011/02/26 11:06:34 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110308.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110308.ebuild
deleted file mode 100644
index 22a8d59e41ca..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110308.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110308.ebuild,v 1.1 2011/03/08 06:21:46 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110401.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110401.ebuild
deleted file mode 100644
index 06c1e6109bf3..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110401.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110401.ebuild,v 1.1 2011/04/01 10:35:38 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110505.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110505.ebuild
deleted file mode 100644
index 35a1ca6efd37..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110505.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110505.ebuild,v 1.1 2011/05/05 10:57:00 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110526.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110526.ebuild
deleted file mode 100644
index 220c9aba86c0..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110526.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110526.ebuild,v 1.1 2011/05/26 09:37:35 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110527.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110527.ebuild
deleted file mode 100644
index 1189b4c4bbf5..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110527.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110527.ebuild,v 1.1 2011/05/27 10:28:55 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="ssl tk"
-
-inherit eutils portability python toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="extendnmr +opengl"
-
-RDEPEND="
-	dev-lang/tk[threads]
-	>=dev-python/numpy-1.4
-	>=dev-tcltk/tix-8.4.3
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links || die
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type d -delete
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
-	use extendnmr && _wrapper="${_wrapper} extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	local in_path
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	in_path=$(python_get_sitedir)/${PN}
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's:#from __future__:from __future__:g' \
-		-i ${i} || die
-	done
-
-	insinto ${in_path}
-
-	dodir ${in_path}/c
-
-	ebegin "Installing main files"
-		doins -r python || die "main files installation failed"
-	eend
-		dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc || die
-	for i in ${pydocs}; do
-		dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i}
-	done
-
-	dosym /usr/share/ccpn/data ${in_path}/data
-	dosym /usr/share/ccpn/model ${in_path}/model
-
-	einfo "Adjusting permissions"
-
-	files="
-		cambridge/c/BayesPeakSeparator.so
-		ccp/c/StructUtil.so
-		ccp/c/StructStructure.so
-		ccp/c/StructBond.so
-		ccp/c/StructAtom.so
-		ccpnmr/c/DyAtomCoord.so
-		ccpnmr/c/DyDistConstraint.so
-		ccpnmr/c/DyDistForce.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/DyAtomCoordList.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/PeakCluster.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/Midge.so
-		ccpnmr/c/DyDistConstraintList.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/DyDynamics.so
-		ccpnmr/c/ContourFile.so
-		memops/c/ShapeFile.so
-		memops/c/BlockFile.so
-		memops/c/PdfHandler.so
-		memops/c/MemCache.so
-		memops/c/FitMethod.so
-		memops/c/PsHandler.so
-		memops/c/GlHandler.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110602.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110602.ebuild
index bfed9397d760..554159e3ec8c 100644
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110602.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.2.1_p110602.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110602.ebuild,v 1.1 2011/06/02 07:36:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110602.ebuild,v 1.2 2011/06/29 05:51:28 jlec Exp $
 
 EAPI="3"
 
@@ -81,23 +81,23 @@ src_prepare() {
 	rm -rf data model doc license || die
 
 	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
+		-e "s|/usr|${EPREFIX}/usr|g" \
+		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+		-e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
+		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
+		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
+		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
+		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
+		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
+		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
+		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
+		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
+		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
+		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
+		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
 		c/environment_default.txt > c/environment.txt
 }
 
@@ -119,12 +119,12 @@ src_install() {
 	use extendnmr && _wrapper="${_wrapper} extendNmr"
 	for wrapper in ${_wrapper}; do
 		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
+			-e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|g" \
+		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
+			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
+			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
+			-e "s|gentoopython|${EPREFIX}/usr/bin/python|g" \
+			-e "s|//|/|g" \
 			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
 		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
 	done
@@ -140,7 +140,7 @@ src_install() {
 
 	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
 	sed \
-		-e 's:#from __future__:from __future__:g' \
+		-e 's|#from __future__|from __future__|g' \
 		-i ${i} || die
 	done
 
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p110222.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110629.ebuild
index 5c6451c73318..0bacba781a14 100644
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p110222.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.2.1_p110629.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110222.ebuild,v 1.1 2011/02/22 10:35:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p110629.ebuild,v 1.1 2011/06/29 05:51:28 jlec Exp $
 
 EAPI="3"
 
@@ -81,23 +81,23 @@ src_prepare() {
 	rm -rf data model doc license || die
 
 	sed \
-		-e "s:/usr:${EPREFIX}/usr:g" \
-		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
-		-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
-		-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
-		-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
-		-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \
-		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
+		-e "s|/usr|${EPREFIX}/usr|g" \
+		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+		-e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
+		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
+		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
+		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
+		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
+		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
+		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
+		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
+		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
+		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
+		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
+		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
 		c/environment_default.txt > c/environment.txt
 }
 
@@ -119,12 +119,12 @@ src_install() {
 	use extendnmr && _wrapper="${_wrapper} extendNmr"
 	for wrapper in ${_wrapper}; do
 		sed \
-			-e "s:gentoo_sitedir:${EPREFIX}$(python_get_sitedir):g" \
-		   -e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \
-			-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \
-			-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \
-			-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \
-			-e "s://:/:g" \
+			-e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|g" \
+		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
+			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
+			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
+			-e "s|gentoopython|${EPREFIX}/usr/bin/python|g" \
+			-e "s|//|/|g" \
 			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
 		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
 	done
@@ -140,7 +140,7 @@ src_install() {
 
 	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
 	sed \
-		-e 's:#from __future__:from __future__:g' \
+		-e 's|#from __future__|from __future__|g' \
 		-i ${i} || die
 	done
 
diff --git a/sci-chemistry/ccpn/metadata.xml b/sci-chemistry/ccpn/metadata.xml
index 032b2a83a1fe..d65c846daad4 100644
--- a/sci-chemistry/ccpn/metadata.xml
+++ b/sci-chemistry/ccpn/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
-<maintainer>
-  <email>jlec@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name='extendnmr'>Install needed packages for extendNMR support</flag>
-</use>
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="extendnmr">Install needed packages for extendNMR support</flag>
+	</use>
 </pkgmetadata>