sci-chemistry/ccpn: Todays python patches; dop old

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

11 files changed, 12 insertions, 1496 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index b364dab79261..09b889bc8cd0 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-chemistry/ccpn
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.156 2015/01/08 07:58:02 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.157 2015/01/22 16:25:49 jlec Exp $
+
+*ccpn-2.4.1_p150122 (22 Jan 2015)
+
+  22 Jan 2015; Justin Lecher <jlec@gentoo.org> -ccpn-2.3.1_p140425.ebuild,
+  -ccpn-2.4.0_p140915.ebuild, -ccpn-2.4.0_p140917.ebuild,
+  -ccpn-2.4.0_p140925.ebuild, -ccpn-2.4.1_p141008.ebuild,
+  -ccpn-2.4.1_p141020.ebuild, -ccpn-2.4.1_p141022.ebuild,
+  -ccpn-2.4.1_p141117.ebuild, -ccpn-2.4.1_p141204.ebuild,
+  -ccpn-2.4.1_p150105.ebuild, +ccpn-2.4.1_p150122.ebuild:
+  Todays python patches; dop old
 
 *ccpn-2.4.1_p150108 (08 Jan 2015)
 
diff --git a/sci-chemistry/ccpn/ccpn-2.3.1_p140425.ebuild b/sci-chemistry/ccpn/ccpn-2.3.1_p140425.ebuild
deleted file mode 100644
index b1a8378529b1..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.3.1_p140425.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.3.1_p140425.ebuild,v 1.1 2014/04/25 14:31:14 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}r2.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.0_p140915.ebuild b/sci-chemistry/ccpn/ccpn-2.4.0_p140915.ebuild
deleted file mode 100644
index 9917441dbad0..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.0_p140915.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.0_p140915.ebuild,v 1.1 2014/09/15 11:55:15 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.0_p140917.ebuild b/sci-chemistry/ccpn/ccpn-2.4.0_p140917.ebuild
deleted file mode 100644
index 9136ad8d6023..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.0_p140917.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.0_p140917.ebuild,v 1.1 2014/09/17 10:29:14 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.0_p140925.ebuild b/sci-chemistry/ccpn/ccpn-2.4.0_p140925.ebuild
deleted file mode 100644
index 6cd568ca62a4..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.0_p140925.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.0_p140925.ebuild,v 1.1 2014/09/25 07:03:55 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.1_p141008.ebuild b/sci-chemistry/ccpn/ccpn-2.4.1_p141008.ebuild
deleted file mode 100644
index d5afdd8cda0a..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.1_p141008.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.1_p141008.ebuild,v 1.2 2014/10/08 07:29:07 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.1_p141020.ebuild b/sci-chemistry/ccpn/ccpn-2.4.1_p141020.ebuild
deleted file mode 100644
index b9e9e8b2b58b..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.1_p141020.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.1_p141020.ebuild,v 1.1 2014/10/20 10:44:36 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.1_p141022.ebuild b/sci-chemistry/ccpn/ccpn-2.4.1_p141022.ebuild
deleted file mode 100644
index 3a663bd1f892..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.1_p141022.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.1_p141022.ebuild,v 1.1 2014/10/22 08:52:51 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.1_p141117.ebuild b/sci-chemistry/ccpn/ccpn-2.4.1_p141117.ebuild
deleted file mode 100644
index f594243c42ac..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.1_p141117.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.1_p141117.ebuild,v 1.1 2014/11/17 08:01:09 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.1_p141204.ebuild b/sci-chemistry/ccpn/ccpn-2.4.1_p141204.ebuild
deleted file mode 100644
index a6def8adae93..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.4.1_p141204.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.1_p141204.ebuild,v 1.1 2014/12/04 08:20:03 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl,tk"
-
-inherit eutils flag-o-matic multilib portability python-single-r1 toolchain-funcs versionator
-
-PATCHSET="${PV##*_p}"
-MY_PN="${PN}mr"
-MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
-MY_MAJOR="$(get_version_component_range 1-3)"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
-[[ -n ${PATCHSET} ]] \
-	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="+opengl"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/tk[threads]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-tcltk/tix
-	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
-	sci-biology/psipred
-	x11-libs/libXext
-	x11-libs/libX11
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
-
-	epatch "${FILESDIR}"/2.3.1-parallel.patch
-
-	append-lfs-flags
-
-	sed \
-		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
-		-e "s:weights_s:weights:g" \
-		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_TRUE"
-		GL_DIR="${EPREFIX}/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-
-	GLUT_NOT_IN_GL=""
-	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	rm -rf data model doc license || die
-
-	sed \
-		-e "s|/usr|${EPREFIX}/usr|g" \
-		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
-		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${CFLAGS}|g" \
-		-e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
-		-e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
-		-e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
-		-e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
-		-e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
-		-e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
-		-e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
-		-e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
-		-e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
-		-e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(TK_LIB =\).*|\1 -ltk|g" \
-		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
-		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
-		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
-		c/environment_default.txt > c/environment.txt || die
-
-	sed \
-		-e 's:ln -s:cp -f:g' \
-		-i $(find python -name linkSharedObjs) || die
-}
-
-src_compile() {
-	emake -C c all
-	emake -C c links
-}
-
-src_install() {
-	local libdir
-	local tkver
-	local _wrapper
-
-	find . -name "*.pyc" -type f -delete || die
-
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
-	for wrapper in ${_wrapper}; do
-		sed \
-			-e "s|gentoo_sitedir|$(python_get_sitedir)|g" \
-		   -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
-			-e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
-			-e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
-			-e "s|gentoopython|${EPYTHON}|g" \
-			-e "s|gentoousr|${EPREFIX}/usr|g" \
-			-e "s|//|/|g" \
-			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper}
-	done
-
-	local in_path=$(python_get_sitedir)/${PN}
-	local files
-	local pydocs
-
-	pydocs="$(find python -name doc -type d)"
-	rm -rf ${pydocs} || die
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-	sed \
-		-e 's|#from __future__|from __future__|g' \
-		-i ${i} || die
-	done
-
-	dodir ${in_path#${EPREFIX}}/c
-
-	ebegin "Installing main files"
-		python_moduleinto ${PN}
-		python_domodule python
-	eend
-
-	ebegin "Adjusting permissions"
-	for _file in $(find "${ED}" -type f -name "*so"); do
-		chmod 755 ${_file}
-	done
-	eend
-	python_optimize
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.4.1_p150105.ebuild b/sci-chemistry/ccpn/ccpn-2.4.1_p150122.ebuild
index 81f5688f057f..9baba20420e3 100644
--- a/sci-chemistry/ccpn/ccpn-2.4.1_p150105.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.4.1_p150122.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.1_p150105.ebuild,v 1.1 2015/01/05 13:51:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.1_p150122.ebuild,v 1.1 2015/01/22 16:25:49 jlec Exp $
 
 EAPI=5