sci-chemistry/ccpn -- inclusion of todays patchset

(Portage version: 2.2_rc60/git/Linux x86_64)
 (Signed Manifest commit)

6 files changed, 40 insertions, 549 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index e83a84a35..85ccd7319 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -2,6 +2,17 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  20 Dec 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> -ccpn-2.1.0.ebuild,
+  -ccpn-2.1.0-r1.ebuild, -ccpn-2.1.1.ebuild, -ccpn-2.1.2_p1.ebuild,
+  +ccpn-2.1.2_p1-r4.ebuild:
+  cleanup of old versions
+
+*ccpn-2.1.2_p1-r4 (20 Dec 2009)
+
+  20 Dec 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +ccpn-2.1.2_p1-r4.ebuild:
+  Include todays patchset
+
 *ccpn-2.1.2_p1-r3 (20 Dec 2009)
 
   20 Dec 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index a5e017e50..5753bc4e5 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -13,20 +13,18 @@ DIST analysis2.1.1.tar.gz 18972580 RMD160 17e0fca7dc6b1c272ebbff68cb2589ab3bbff9
 DIST analysis2.1.2_1.tar.gz 19227793 RMD160 f633a8338e3fbb9d8ad77c9482d63191419b0885 SHA1 f711a424da22c84295610483a6cc481d2d2161e9 SHA256 e7eda0b50c357a2b62633c473da4621ccdc48c747c59d8ccb495d57e846308fa
 DIST update-091012.patch.bz2 41959 RMD160 3ddb011d80935fea02fbf00fd06cadd32d86ecbc SHA1 467a41d1f634417739af09dc8a725f4b32238e5c SHA256 fe5051256f81d2f59a19b2463a7b6c5697680030b4b2823a6b6869eec85b8dbb
 DIST update-091025.patch.bz2 17170 RMD160 5b2b440b742345a815158e63e356f82cfce933f6 SHA1 569e370e819c940e904696e1ab4eae7380e035d0 SHA256 5467ccd9bb437f1d0720a02e2629120319a61d77cc246cbdbaadc89deb884a51
+DIST update-091220.patch.bz2 16551 RMD160 6a4f12c88be5e0a5af3f4ec560d4e795006ea231 SHA1 f5b1c31f82f8ae930b11ba742ea09c09a9b45d24 SHA256 e355f42fd1e82fbf39377c56472f20346aea7c5aab97df4c36c508a31b6dacb5
 EBUILD ccpn-2.0.7.1-r2.ebuild 4550 RMD160 4adb7d8e25ae01b7c390475fa253e3408425e5fd SHA1 a177bc13e9f9da9f82e86acc6579ef3d11d227ff SHA256 e7f5ad42f1a095259c37ce9a6fe45a462fd105971b90719b3ad66cebe7e82865
-EBUILD ccpn-2.1.0-r1.ebuild 4020 RMD160 266630e5c59e305654c8945de40cf5505b054b13 SHA1 4b9922f385b8df068f37fbdbb5c1c5828ef086c9 SHA256 21dd4e262ddd5c361900828561f20aa0777895d5a2c9f35d4d72f4208c39cb09
 EBUILD ccpn-2.1.0-r4.ebuild 4167 RMD160 63f746dd33faa4a753d24ae0fc75c31bde3c3a61 SHA1 3624b2792b39a4db868006eb0711f180abb6dcd4 SHA256 3d82036ffcda14918e6924fd8eef89e56c85d1776f359071ad15d5620708f8e7
-EBUILD ccpn-2.1.0.ebuild 4546 RMD160 86a4d9260ca3aa7a401e5b311bc336794d14f311 SHA1 1220889c05b6e9ba814ffa32d83360ed3eccf471 SHA256 afc425f1e75a995322972a51f899d52d69610953d5e59cdb968277695b54ab87
 EBUILD ccpn-2.1.1-r1.ebuild 4195 RMD160 7e67b7712b448f098c01fbe0c19d1f5eab7a8d64 SHA1 4580a861ce8fcafe6c82254117339d3a0fc36db2 SHA256 6a945186e8d349b3d53de852b8d651889cdc092f5b3123ec3c2c40b56b75c81c
-EBUILD ccpn-2.1.1.ebuild 4198 RMD160 8e96ef08f37bb6f611f04ebefefed19cfccd40d8 SHA1 514275f5692cacb255a7afa1f9a80d7280a5acf1 SHA256 a5ee0484748f116a6b304e33068e991ef13d5a50431fec4416c2e05c9ad5697a
 EBUILD ccpn-2.1.2_p1-r3.ebuild 4083 RMD160 2867b8e5c80c0391aa7d0d4688e383bd42331394 SHA1 f6ae4acb9a7a926da7d1219cd3918bb0e7c4ffea SHA256 061cc050cff5d4e31ce808705dc3dabe4b95c7c2a747659d3670347134757582
-EBUILD ccpn-2.1.2_p1.ebuild 4234 RMD160 b6c388a3e007f4be1e2f77bfd3fa99b09f09a616 SHA1 dfd1cf22e8966cce10cdbcde58d4c2177a642369 SHA256 ee19c851faeb6b97504b8684177c444ec9c630e90a359f46c5428c33834978f7
-MISC ChangeLog 5057 RMD160 2c476b3dfdb6bb7b7da190e122aa689fc1593d73 SHA1 27c1825e0013cc52844595d93c3624f7c427888e SHA256 f6179398cbd279b4033089e87963b87f2d933a653bfe3277b5db987696f5f032
+EBUILD ccpn-2.1.2_p1-r4.ebuild 4110 RMD160 e692383d827c067d4c6c08eae4c3ebf7acb8ea21 SHA1 2f1022b4e729c61a34a5accc50831058272d2f9c SHA256 ae931526ced750af05329f92bffe57d1fc13b5535e39bf2cb440dead74bbb26b
+MISC ChangeLog 5402 RMD160 21cdd499a4f35f92c97a0f5a12531c6fb98d1e4d SHA1 c2a949fd0831aac15cfd94354c742b4e60e98994 SHA256 4e8de45081cda5380ca6dfd1e4632281b7e9601e4ed0297b1098d98e505a1e2c
 MISC metadata.xml 339 RMD160 2e62dd84c66f8229f9f75832b91b3921a23386c9 SHA1 3252b1e326b3ba201266861d6461bcc069ad770e SHA256 bbb58d377587da3e6a2d4a742829e24b2c840be26d8e8da2d3f6fbf26c0143ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAksuKs8ACgkQgAnW8HDreRaW/QCgmDEcgkcARQvQ0Sh8+KOmA+0M
-N+EAnic/857KcjhW/InXWuF+yf50oWZr
-=YWlg
+iEYEARECAAYFAksuOuwACgkQgAnW8HDreRYkMQCgjTW3XtLDppXjBrJXlZiZIJIc
+NL8An1PxhP9RbCz5u9w6BzAjmjAVk1IH
+=J9iM
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.1.0-r1.ebuild b/sci-chemistry/ccpn/ccpn-2.1.0-r1.ebuild
deleted file mode 100644
index 8daf55825..000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.5
-PYTHON_MODNAME="${PN}"
-PYTHON_USE_WITH="ssl tk"
-EAPI="2"
-
-inherit distutils portability python toolchain-funcs versionator
-
-MY_PN="${PN}mr"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${PV}.tar.gz"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/elementtree
-	dev-python/numpy
-	dev-tcltk/tix
-	virtual/glut"
-DEPEND="${RDEPEND}"
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_version
-}
-
-src_prepare() {
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		if has_version media-libs/freeglut; then
-			GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		else
-			GLUT_NEED_INIT=""
-		fi
-
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_FALSE"
-		GL_DIR="/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-		GLUT_NOT_IN_GL=""
-		GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	sed \
-		-e "s:^\(CC = \).*:\1$(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG = \).*:\1${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG = \).*:\1${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG = \).*:\1${GL_FLAG}:g" \
-		-e "s:^\(GLUT_NEED_INIT = \).*:\1${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL = \).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS = \).*:\1-I\$(PYTHON_DIR)/include/python${PYVER}:g" \
-		-e "s:^\(GL_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake \
-		-C c \
-		all links || \
-		die "failed to compile"
-}
-
-src_install() {
-
-	local in_path
-	local gentoo_sitedir
-	local libdir
-	local files
-	local tkver
-
-	in_path=$(python_get_sitedir)/${PN}
-	gentoo_sitedir=$(python_get_sitedir)
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	for wrapper in analysis dangle dataShifter eci formatConverter pipe2azara; do
-		sed -e "s:gentoo_sitedir:${gentoo_sitedir}:g" \
-		    -e "s:libdir:${libdir}:g" \
-			-e "s:tkver:${tkver}:g" \
-		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	use doc && treecopy $(find . -name doc) "${D}"usr/share/doc/${PF}/html/
-
-	ebegin "Removing unneeded docs"
-	find . -name doc -exec rm -rf '{}' \; 2> /dev/null
-	eend
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-		sed \
-			-e 's:#from __future__:from __future__:g' \
-			-i ${i}
-	done
-
-	insinto ${in_path}
-
-	ebegin "Installing main files"
-	doins -r data model python || die "main files installation failed"
-	eend
-
-	einfo "Adjusting permissions"
-
-	files="ccpnmr/c/ContourFile.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Midge.so
-		ccp/c/StructAtom.so
-		ccp/c/StructBond.so
-		ccp/c/StructStructure.so
-		ccp/c/StructUtil.so
-		memops/c/BlockFile.so
-		memops/c/FitMethod.so
-		memops/c/GlHandler.so
-		memops/c/MemCache.so
-		memops/c/PdfHandler.so
-		memops/c/PsHandler.so
-		memops/c/ShapeFile.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.0.ebuild b/sci-chemistry/ccpn/ccpn-2.1.0.ebuild
deleted file mode 100644
index a2e148094..000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.0.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.5
-PYTHON_MODNAME="ccpn"
-PYTHON_USE_WITH="ssl tk"
-EAPI="2"
-
-inherit eutils distutils multilib portability python toolchain-funcs versionator
-
-MY_PN="${PN}mr"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${PV}.tar.gz"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/elementtree
-	dev-python/numpy
-	dev-tcltk/tix
-	virtual/glut"
-DEPEND="${RDEPEND}"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_version
-}
-
-src_prepare() {
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		if has_version media-libs/freeglut; then
-			ccpnadd GLUT_NEED_INIT = -DNEED_GLUT_INIT
-		else
-			ccpnadd GLUT_NEED_INIT =
-		fi
-
-		ccpnadd IGNORE_GL_FLAG =
-		ccpnadd GL_FLAG = -DUSE_GL_FALSE
-		ccpnadd GLUT_NOT_IN_GL =
-		ccpnadd GL_DIR = /usr
-		ccpnadd GL_LIB = -lglut -lGLU -lGL
-		ccpnadd GL_INCLUDE_FLAGS = -I\$\(GL_DIR\)/include
-		ccpnadd GL_LIB_FLAGS = -L\$\(GL_DIR\)/$(get_libdir)
-
-	else
-		ccpnadd IGNORE_GL_FLAG = -DIGNORE_GL
-		ccpnadd GL_FLAG = -DUSE_GL_FALSE
-		ccpnadd GLUT_NOT_IN_GL =
-	fi
-	ccpnadd GLUT_FLAG = \$\(GLUT_NEED_INIT\) \$\(GLUT_NOT_IN_GL\)
-	ccpnadd CC = $(tc-getCC)
-	ccpnadd LINK_FLAGS = ${LDFLAGS} -fPIC
-	ccpnadd MALLOC_FLAG =
-	ccpnadd FPIC_FLAG = -fPIC
-	ccpnadd SHARED_FLAGS = -shared
-	ccpnadd MATH_LIB = -lm
-	ccpnadd X11_DIR = /usr
-	ccpnadd X11_LIB = -lX11 -lXext
-	ccpnadd X11_INCLUDE_FLAGS = -I\$\(X11_DIR\)/include
-	ccpnadd X11_LIB_FLAGS = -L\$\(X11_DIR\)/lib
-	ccpnadd TCL_DIR = /usr
-	ccpnadd TCL_LIB = -ltcl${tk_ver}
-	ccpnadd TCL_INCLUDE_FLAGS = -I\$\(TCL_DIR\)/include
-	ccpnadd TCL_LIB_FLAGS = -L\$\(TCL_DIR\)/$(get_libdir)
-	ccpnadd TK_DIR = /usr
-	ccpnadd TK_LIB = -ltk${tk_ver}
-	ccpnadd TK_INCLUDE_FLAGS = -I\$\(TK_DIR\)/include
-	ccpnadd TK_LIB_FLAGS = -L\$\(TK_DIR\)/$(get_libdir)
-	ccpnadd PYTHON_DIR = /usr
-	ccpnadd PYTHON_INCLUDE_FLAGS = -I\$\(PYTHON_DIR\)/include/python${PYVER}
-	ccpnadd CC_FLAGS = ${CFLAGS} \$\(MALLOC_FLAG\) \$\(FPIC_FLAG\)
-	ccpnadd LINK = $(tc-getCC)
-	ccpnadd MAKE = make
-	ccpnadd CO_NAME = -c \$\<
-	ccpnadd OUT_NAME = -o \$@
-	ccpnadd OBJ_SUFFIX = o
-	ccpnadd DYLIB_SUFFIX = so
-	ccpnadd RM = rm -f
-	ccpnadd LINK_LIBRARIES = sh linkSharedObjs
-}
-
-src_compile() {
-	emake \
-		-C c \
-		all links || \
-		die "failed to compile"
-}
-
-src_install() {
-
-	local in_path
-	local gentoo_sitedir
-	local libdir
-	local files
-	local tkver
-
-	in_path=$(python_get_sitedir)/${PN}
-	gentoo_sitedir=$(python_get_sitedir)
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	for wrapper in analysis dangle dataShifter formatConverter pipe2azara; do
-		sed -e "s:gentoo_sitedir:${gentoo_sitedir}:g" \
-		    -e "s:libdir:${libdir}:g" \
-			-e "s:tkver:${tkver}:g" \
-		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	use doc && treecopy $(find . -name doc) "${D}"usr/share/doc/${PF}/html/
-
-	ebegin "Removing unneeded docs"
-	find . -name doc -exec rm -rf '{}' \; 2> /dev/null
-	eend
-
-	for i in ccpnmr2.1/python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-		sed \
-			-e 's:#from __future__:from __future__:g' \
-			-i ${i}
-	done
-
-	insinto ${in_path}
-
-	ebegin "Installing main files"
-	doins -r {data,model,python} || die "main files installation failed"
-	eend
-
-	einfo "Adjusting permissions"
-
-	files="
-		ccpnmr/c/ContourFile.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Midge.so
-		ccp/c/StructAtom.so
-		ccp/c/StructBond.so
-		ccp/c/StructStructure.so
-		ccp/c/StructUtil.so
-		memops/c/BlockFile.so
-		memops/c/FitMethod.so
-		memops/c/GlHandler.so
-		memops/c/MemCache.so
-		memops/c/PdfHandler.so
-		memops/c/PsHandler.so
-		memops/c/ShapeFile.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
-
-ccpnadd() {
-	echo $@ >> "${S}"/c/environment.txt
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.1.ebuild b/sci-chemistry/ccpn/ccpn-2.1.1.ebuild
deleted file mode 100644
index 5c87139ee..000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-NEED_PYTHON=2.5
-PYTHON_MODNAME="${PN}"
-PYTHON_USE_WITH="ssl tk"
-#PATCHSET="091011"
-EAPI="2"
-
-inherit distutils portability python toolchain-funcs versionator
-
-MY_PN="${PN}mr"
-
-DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="
-	http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${PV}.tar.gz"
-#	http://dev.gentooexperimental.org/~jlec/distfiles/update-${PATCHSET}.patch.bz2"
-HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-
-SLOT="0"
-LICENSE="|| ( CCPN LGPL-2.1 )"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +opengl"
-
-RDEPEND="
-	dev-lang/tk
-	dev-python/elementtree
-	dev-python/numpy
-	dev-tcltk/tix
-	virtual/glut"
-DEPEND="${RDEPEND}"
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_version
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && \
-		epatch "${WORKDIR}"/update-${PATCHSET}.patch
-
-	local tk_ver
-	local myconf
-
-	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
-
-	if use opengl; then
-		if has_version media-libs/freeglut; then
-			GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		else
-			GLUT_NEED_INIT=""
-		fi
-
-		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_FALSE"
-		GL_DIR="/usr"
-		GL_LIB="-lglut -lGLU -lGL"
-		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
-		GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
-
-	else
-		IGNORE_GL_FLAG="-DIGNORE_GL"
-		GL_FLAG="-DUSE_GL_FALSE"
-	fi
-		GLUT_NOT_IN_GL=""
-		GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
-
-	sed \
-		-e "s:^\(CC = \).*:\1$(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG = \).*:\1${CFLAGS}:g" \
-		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG = \).*:\1${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG = \).*:\1${GL_FLAG}:g" \
-		-e "s:^\(GLUT_NEED_INIT = \).*:\1${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL = \).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS = \).*:\1-I\$(PYTHON_DIR)/include/python${PYVER}:g" \
-		-e "s:^\(GL_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake \
-		-C c \
-		all links || \
-		die "failed to compile"
-}
-
-src_install() {
-
-	local in_path
-	local gentoo_sitedir
-	local libdir
-	local files
-	local tkver
-
-	in_path=$(python_get_sitedir)/${PN}
-	gentoo_sitedir=$(python_get_sitedir)
-	libdir=$(get_libdir)
-	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
-
-	for wrapper in analysis dangle dataShifter eci formatConverter pipe2azara; do
-		sed -e "s:gentoo_sitedir:${gentoo_sitedir}:g" \
-		    -e "s:libdir:${libdir}:g" \
-			-e "s:tkver:${tkver}:g" \
-		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
-		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
-	done
-
-	use doc && treecopy $(find . -name doc) "${D}"usr/share/doc/${PF}/html/
-
-	ebegin "Removing unneeded docs"
-	find . -name doc -exec rm -rf '{}' \; 2> /dev/null
-	eend
-
-	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
-		sed \
-			-e 's:#from __future__:from __future__:g' \
-			-i ${i}
-	done
-
-	insinto ${in_path}
-
-	ebegin "Installing main files"
-	doins -r data model python || die "main files installation failed"
-	eend
-
-	einfo "Adjusting permissions"
-
-	files="ccpnmr/c/ContourFile.so
-		ccpnmr/c/ContourLevels.so
-		ccpnmr/c/ContourStyle.so
-		ccpnmr/c/PeakList.so
-		ccpnmr/c/SliceFile.so
-		ccpnmr/c/WinPeakList.so
-		ccpnmr/c/AtomCoordList.so
-		ccpnmr/c/AtomCoord.so
-		ccpnmr/c/Bacus.so
-		ccpnmr/c/CloudUtil.so
-		ccpnmr/c/DistConstraintList.so
-		ccpnmr/c/DistConstraint.so
-		ccpnmr/c/DistForce.so
-		ccpnmr/c/Dynamics.so
-		ccpnmr/c/Midge.so
-		ccp/c/StructAtom.so
-		ccp/c/StructBond.so
-		ccp/c/StructStructure.so
-		ccp/c/StructUtil.so
-		memops/c/BlockFile.so
-		memops/c/FitMethod.so
-		memops/c/GlHandler.so
-		memops/c/MemCache.so
-		memops/c/PdfHandler.so
-		memops/c/PsHandler.so
-		memops/c/ShapeFile.so
-		memops/c/StoreFile.so
-		memops/c/StoreHandler.so
-		memops/c/TkHandler.so"
-
-	for FILE in ${files}; do
-		fperms 755 ${in_path}/python/${FILE}
-	done
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.2_p1.ebuild b/sci-chemistry/ccpn/ccpn-2.1.2_p1-r4.ebuild
index 6e6ed0408..eb6860ea8 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.2_p1.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.2_p1-r4.ebuild
@@ -5,7 +5,7 @@
 NEED_PYTHON=2.5
 PYTHON_MODNAME="${PN}"
 PYTHON_USE_WITH="ssl tk"
-PATCHSET=""
+PATCHSET="091220"
 EAPI="2"
 
 inherit distutils portability python toolchain-funcs versionator
@@ -20,14 +20,14 @@ HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
 SLOT="0"
 LICENSE="|| ( CCPN LGPL-2.1 )"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc +opengl"
+IUSE="+opengl"
 
 RDEPEND="
 	dev-lang/tk
 	dev-python/elementtree
 	dev-python/numpy
 	dev-tcltk/tix
-	virtual/glut"
+	opengl? ( virtual/glut )"
 DEPEND="${RDEPEND}"
 RESTRICT="mirror"
 
@@ -47,12 +47,7 @@ src_prepare() {
 	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
 
 	if use opengl; then
-		if has_version media-libs/freeglut; then
-			GLUT_NEED_INIT="-DNEED_GLUT_INIT"
-		else
-			GLUT_NEED_INIT=""
-		fi
-
+		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
 		IGNORE_GL_FLAG=""
 		GL_FLAG="-DUSE_GL_FALSE"
 		GL_DIR="/usr"
@@ -64,22 +59,23 @@ src_prepare() {
 		IGNORE_GL_FLAG="-DIGNORE_GL"
 		GL_FLAG="-DUSE_GL_FALSE"
 	fi
-		GLUT_NOT_IN_GL=""
-		GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
+
+	GLUT_NOT_IN_GL=""
+	GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
 
 	sed \
-		-e "s:^\(CC = \).*:\1$(tc-getCC):g" \
-		-e "s:^\(OPT_FLAG = \).*:\1${CFLAGS}:g" \
+		-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \
+		-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \
 		-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \
-		-e "s:^\(IGNORE_GL_FLAG = \).*:\1${IGNORE_GL_FLAG}:g" \
-		-e "s:^\(GL_FLAG = \).*:\1${GL_FLAG}:g" \
-		-e "s:^\(GLUT_NEED_INIT = \).*:\1${GLUT_NEED_INIT}:g" \
-		-e "s:^\(GLUT_NOT_IN_GL = \).*:\1:g" \
-		-e "s:^\(X11_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(TCL_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(TK_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
-		-e "s:^\(PYTHON_INCLUDE_FLAGS = \).*:\1-I\$(PYTHON_DIR)/include/python${PYVER}:g" \
-		-e "s:^\(GL_LIB_FLAGS = \).*:\1-L/usr/$(get_libdir):g" \
+		-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \
+		-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \
+		-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \
+		-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \
+		-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
+		-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
+		-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
+		-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I\$(PYTHON_DIR)/include/python${PYVER}:g" \
+		-e "s:^\(GL_LIB_FLAGS =\).*:\1 -L/usr/$(get_libdir):g" \
 		c/environment_default.txt > c/environment.txt
 }
 
@@ -111,12 +107,6 @@ src_install() {
 		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
 	done
 
-	use doc && treecopy $(find . -name doc) "${D}"usr/share/doc/${PF}/html/
-
-	ebegin "Removing unneeded docs"
-	find . -name doc -exec rm -rf '{}' \; 2> /dev/null
-	eend
-
 	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
 		sed \
 			-e 's:#from __future__:from __future__:g' \
@@ -125,10 +115,15 @@ src_install() {
 
 	insinto ${in_path}
 
+	dodir ${in_path}/c
+
 	ebegin "Installing main files"
 	doins -r data model python || die "main files installation failed"
 	eend
 
+	dohtml -r doc/* || die
+	dosym ../../../../share/doc/${PF}/html ${in_path}/doc || die
+
 	einfo "Adjusting permissions"
 
 	files="ccpnmr/c/ContourFile.so