Version Bump and python patches

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

6 files changed, 492 insertions, 6 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 9381500a9aa3..752dcf0b75d0 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,13 @@
 # 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.56 2011/02/17 11:39:12 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.57 2011/02/22 10:35:38 jlec Exp $
+
+*ccpn-2.2.1_p110222 (22 Feb 2011)
+*ccpn-2.1.5_p110222 (22 Feb 2011)
+
+  22 Feb 2011; Justin Lecher <jlec@gentoo.org> +files/2.2.1-parallel.patch,
+  +files/xeasy2azara, +ccpn-2.1.5_p110222.ebuild, +ccpn-2.2.1_p110222.ebuild:
+  Version Bump and python patches
 
 *ccpn-2.1.5_p110217 (17 Feb 2011)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index c5a2318fccc4..fd0f05c2b08d 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -5,6 +5,7 @@ AUX 2.1.3_1-dynamics.patch 825 RMD160 1941257b998a1063c4a7cce796bdf67415a0380f S
 AUX 2.1.3_1-impl-dec.patch 2818 RMD160 182cb26478750711916c73b7f9ba5e0caeb30bde SHA1 078fee172d7b9cf9f6bd653b53c87351b4625aba SHA256 f175a1b4a9cc4f1636bf36928883d37a266af830234aa3d7676f4fe4f7f1ddd8
 AUX 2.1.3_1-parallel.patch 577 RMD160 8bafa14bec766aaca0e55f33f9b51f10f5f29c43 SHA1 e95891313f669e0908374aa98a725596140150cf SHA256 7e650ef2fa1ff0626349affdf1bc9578fe1da3b8cee7dd9125d33a2164978b69
 AUX 2.1.5-parallel.patch 850 RMD160 8120e0ff579b6ec575cb96b51b8babec63116e0c SHA1 1389f1703ecf86d5ce98a3854314bd85d5c350e1 SHA256 5d9a1a4f1392057167312a844972608fa25afb821453b2057ac1acd03b8711d5
+AUX 2.2.1-parallel.patch 850 RMD160 c2d0c523637325de3109894e564cfdea77e9c11e SHA1 beca108b9d2d17ea550bb26b95fa83160d38eb3a SHA256 318bbf3ae5b04e8cbe0e8e93a7e81a7e793fffa9a0d754464367092d6b79f04d
 AUX analysis 290 RMD160 0615c926527a59cbcafd2084680bd491f55c6295 SHA1 03ed24715a97f96857026ca018c141ad3e685301 SHA256 ce472f49720fe6ed1f217c519ad66eb5921e64e0d4d002683dc516846b99c30d
 AUX dangle 286 RMD160 b0e6b5162b8940f129debfd006fba635b6d250e9 SHA1 d83cf9ee0940ff3d7c62270d8a79384b4e49f7af SHA256 3913f3ea1638638b76997ce02320bde74d279b3391d177e11d11678bfee9da08
 AUX dataShifter 289 RMD160 dde8a9f9effc6ef682cfad550a12b0e98585c8ec SHA1 0ccde2b8aeecdfe5b30c7b953e9cc49f61de3631 SHA256 27daf72a001b8114b7b133a0fb0c284f334a45026f1c1afcd29e46efc794f16d
@@ -13,20 +14,26 @@ AUX eci 274 RMD160 a940e822e64242500ec3aa656f41d908724a3ba2 SHA1 018cd59152dbfb5
 AUX extendNmr 273 RMD160 e8558632bd7ed7760af629afcb18b99ed2779995 SHA1 d78727d0900ff2424a0a8317f6d740876abd496f SHA256 2c690613c543498900a5073b0347cd5e43ef9014ab93abefccfdd871415d26d3
 AUX formatConverter 293 RMD160 a2229663a5d682e17af8a6cb5f927f66ce59bea6 SHA1 fcd45ab7019911756194457bef1889b4320f00f5 SHA256 e0a4c8303185813084b3f2077e8909cd72593f1d0043443d7ba5f21901f81d2a
 AUX pipe2azara 297 RMD160 0cd01c0cf629710ff4b4267d9449b0b1f3d586e1 SHA1 16566033682903504d77f4acaa93a6625557087e SHA256 e34774b668732c3f4fb764e6c83cc938da3fb514cf5a58bb820827304dc80979
+AUX xeasy2azara 295 RMD160 1d0ba266c71d25d5afa3df243c84000307787dc3 SHA1 8ccbbd7ac24b9f2ec943899e0df1297d2d614623 SHA256 833ebb5b390e4181d15d7e5d2fc703b82e2dca65d6a90f575645c22ccec68ed9
 DIST analysis2.1.3_1.tar.gz 18932918 RMD160 5f19ea6fe47c2910d16fcba8d1a78f0e1dead731 SHA1 683bdfb17d14979eb6477aaa99e4c4af5003beb2 SHA256 bbc1ba5434f896d38b6745c1dc9adc470a78d3be7b879160edcd635a19228b74
 DIST analysis2.1.5.tar.gz 20338459 RMD160 b0706c859c1ee4da2ab80ee41534197268f73d44 SHA1 70dc5e6b2752d6b7d5c8673fc992ebd0a88e6ad0 SHA256 9f91f1bd56fb73fd24e71d396c96c0f0d31b92287664b6a2e756f6efc630b31b
+DIST analysis2.2.1.tar.gz 20974926 RMD160 5905f43fc1399a656f018808c4a2f8dd3d247ca9 SHA1 eed30da55a719ef6c29431e3b3c5a76f521010dc SHA256 d1252811b3db3a30d96a73368bae8abcb05de02fcd2f1f9c502d71dff5e00d13
 DIST ccpn-update-100806.patch.bz2 187965 RMD160 3297162fe3314aa405ee58737ce45cda084834e5 SHA1 338423d9f36da3fb10dc9d9a3b8aeb932ae3bfd0 SHA256 5cea7899edb96237a6674f04a1beee6ad7b309e12964ea8b25d9ea6ff752d0d4
 DIST ccpn-update-110202.patch.bz2 54603 RMD160 81d4123e155816c372702084a8d1433e256ec365 SHA1 57f4496f51b9e16b1eb5b85dcb332b032e61da97 SHA256 9f2dd2106ceef1fb120ee9d1f5973e2ac8105c260c8e981b429211738747fb02
 DIST ccpn-update-2.1.5-110217.patch.bz2 64228 RMD160 41035b6bedcb87e84991050aad8c8d5269f7d4c7 SHA1 7593cce4f807fec7e4c83bdf94ac65d4b3b09af4 SHA256 861eb26c2ad12c2566a5eab3a9abf2607ac43d511512717977a15069d73da049
+DIST ccpn-update-2.1.5-110222.patch.bz2 64519 RMD160 726a0b719d33d3847a4d89d5ffd32be73255a1b2 SHA1 69d5e2cae6813b45ed9687829c5ef6a3dcdb2c3f SHA256 c83c3ca35be51f29719d50622ee6700cc6c9b57640f6f002a66d46d256a42970
+DIST ccpn-update-2.2.1-110222.patch.bz2 2346 RMD160 89ebe4954b56b25e59f81a7243af088068323f11 SHA1 4b94bf6fa2d1bd1dd0d4bdd2fae4a6caf64b0d1d SHA256 7dd92ee0350beaefddbcbd62420aa5b3699f0797f31a4d47799d2669d8499b7a
 EBUILD ccpn-2.1.3.1_p100806.ebuild 5190 RMD160 c1dd4e2443ab5cf8386627a9feba25be6e61b715 SHA1 0d9700191a04c6ed5f106e2712b010d499315827 SHA256 ed26ef362193f91d4726fd49a1c4b19c1f975c3847b0616ada2e64ce7a90ffa5
 EBUILD ccpn-2.1.5_p110202.ebuild 5770 RMD160 98c49d481a5a0e28d2f62b303950bab3467c3246 SHA1 2fb5b0d792b4dcfac20f4d11d405104ab5f81129 SHA256 77d1d7239204ffa4247501133996478e13f07b863fdfebe5d4b056089f9e08ba
 EBUILD ccpn-2.1.5_p110217.ebuild 5794 RMD160 acbb36a1c2f01d9d6944b421b20f5c6ed8a2766e SHA1 268ced5e44ed04339e96242560c06d84ebb3031e SHA256 b6b776e2972389b0e2cbd8054c4a52bb50a5310e5c99364bd7b4ae0cd32c3872
-MISC ChangeLog 9510 RMD160 3b5770235152820fc8f38f5437d9001d6ec07d4f SHA1 5a9e5bc7e4a9ef6abf560afee0b0492cc94d905c SHA256 0283d4d713c479935a412ffeb5b06253fa383cd55003c6aebf52343a6a08271f
+EBUILD ccpn-2.1.5_p110222.ebuild 5794 RMD160 3a528e62388cd87f6911d00049687f4ad8a21990 SHA1 3c4443f4caa7a7138cc4e33d7ae29988413849db SHA256 b7b1180d996abc515d8d4040c6119f3798b5d8c2f035b5d57f33d05616f99cb9
+EBUILD ccpn-2.2.1_p110222.ebuild 5806 RMD160 9145fa2208f389a1399e91a3406190cb92ebb6bc SHA1 8b978ecaf8cb6992a958170b80a71f9399726b5c SHA256 a7102fefe463355b9a0119850fb3c1ae597c663814ac83e340908820eef97be5
+MISC ChangeLog 9768 RMD160 ea5650daa7f2ae9f7ecc89b4705a70b6ab3d802b SHA1 3175044120db134720e922e1386a1f1d9308a912 SHA256 0e2c20822ae9243cace24ae77acec9b3955d6cd8e710f2dbe56f0dd899868ab4
 MISC metadata.xml 317 RMD160 6e56ad407f163d80504468f6fedcfb35fc31db00 SHA1 30b72b0612b1f91712537d24e3a2407eec50e1dd SHA256 1fb093ab05124dcd078fc93a4aa6f787f5829066e100ed98da8ecf65cece63fb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1dCOUACgkQgAnW8HDreRZoXQCeM0Fy8/dXv10Xf7YTQoP/pWs4
-zJYAniLwANMMi772c56FoNcNX/2x2il1
-=DgqC
+iEYEARECAAYFAk1jkYAACgkQgAnW8HDreRZE+gCfeQd8N8au0UxNLpk4CyUrHcoU
+rBcAoIi0y4ur3IWKG5pdrFyyAS/ZgQgU
+=IWDF
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110222.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110222.ebuild
new file mode 100644
index 000000000000..80608cf7391d
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.1.5_p110222.ebuild
@@ -0,0 +1,213 @@
+# 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.2.1_p110222.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p110222.ebuild
new file mode 100644
index 000000000000..5c6451c73318
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.2.1_p110222.ebuild
@@ -0,0 +1,213 @@
+# 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 $
+
+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/files/2.2.1-parallel.patch b/sci-chemistry/ccpn/files/2.2.1-parallel.patch
new file mode 100644
index 000000000000..9223ea8828c2
--- /dev/null
+++ b/sci-chemistry/ccpn/files/2.2.1-parallel.patch
@@ -0,0 +1,38 @@
+diff --git a/ccpnmr2.2/c/Makefile b/ccpnmr2.2/c/Makefile
+index 01fb25a..8e8e1fe 100644
+--- a/ccpnmr2.2/c/Makefile
++++ b/ccpnmr2.2/c/Makefile
+@@ -5,22 +5,22 @@ all: compile
+ compile: global structure analysis clouds dynamics bayes
+ 
+ global:
+-	cd memops/global && $(MAKE)
++	$(MAKE) -C memops/global
+ 
+-structure:
+-	cd ccp/structure && $(MAKE)
++structure: global
++	$(MAKE) -C ccp/structure
+ 
+-analysis:
+-	cd ccpnmr/analysis && $(MAKE)
++analysis: global
++	$(MAKE) -C ccpnmr/analysis
+ 
+-clouds:
+-	cd ccpnmr/clouds && $(MAKE)
++clouds: global
++	$(MAKE) -C ccpnmr/clouds
+ 
+-dynamics:
+-	cd ccpnmr/dynamics && $(MAKE)
++dynamics: global
++	$(MAKE) -C ccpnmr/dynamics
+ 
+-bayes:
+-	cd other/cambridge/bayes && $(MAKE)
++bayes: global
++	$(MAKE) -C other/cambridge/bayes
+ 
+ clean: global_clean structure_clean analysis_clean clouds_clean dynamics_clean bayes_clean
+ 
diff --git a/sci-chemistry/ccpn/files/xeasy2azara b/sci-chemistry/ccpn/files/xeasy2azara
new file mode 100644
index 000000000000..68db2bf57695
--- /dev/null
+++ b/sci-chemistry/ccpn/files/xeasy2azara
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+export CCPNMR_TOP_DIR=gentoo_sitedir
+export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
+export LD_LIBRARY_PATH=gentoolibdir
+export TCL_LIBRARY=gentootcl
+export TK_LIBRARY=gentootk
+gentoopython -O ${CCPNMR_TOP_DIR}/ccpn/python/ccp/format/spectra/params/XeasyData.py $1 $2 $3 $4 $5 $6