ccpn version bump and rewrittings

5 files changed, 198 insertions, 2 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 14547878c..a998f4d68 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ccpn-2.1.0-r1 (18 Sep 2009)
+
+  18 Sep 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  ccpn-2.0.7.1-r2.ebuild, +ccpn-2.1.0-r1.ebuild, +files/eci:
+  version bump
+  rewriten way of setting the env for compilation
+  USE opengl by default
+  distutils removed
+  pkg_postrm removes now all updates files from system
+
   14 Jul 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
   -ccpn-2.0.7.1-r1.ebuild, ccpn-2.0.7.1-r2.ebuild,
   -files/missing-link.patch:
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index 6e824a87d..cd2e88809 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -1,9 +1,12 @@
 AUX analysis 314 RMD160 1dbc562b3f2bccf54aa5643cd1d1d720a4408462 SHA1 af07f84644ec42d5af13f75610e2592a4d6c6604 SHA256 e633940d6c14961a696463927bc97c8e09718e7fe94416616930bf61ea8db005
 AUX dangle 310 RMD160 4e628780a6dcf2021da59a296629494c8f90b508 SHA1 bc80aa4ac54603a9c76263c25ab562c65dd69163 SHA256 412548a1d3b41ff27124c72da4b908a068c4828ea968f27f0df0a9bcdbca014e
 AUX dataShifter 313 RMD160 2f9d3ee79249a27c640f6bb19345f9f5dcb7e534 SHA1 783e3771e35d518f09db486dca956fbd3666c094 SHA256 24375d9e69b9ae103ba16d975d669bde475e31cc8828fa6e6feb4914c0099dd3
+AUX eci 303 RMD160 ed5d3ad597560a567f27a0587c952510169f0302 SHA1 09ff4a41759b9c7ca9f1914a8d223861eab0fae4 SHA256 93fe82d31796e5364ca034ea2dd6119459fbd08e61e277e46037676b1d756089
 AUX formatConverter 317 RMD160 a0f3424901c96bfffd01e8b8a667357b6a29f78a SHA1 cffb6eddcd15202bbda415938e0f9c75a4e98f56 SHA256 46e48c921b0d59b87bbd5dbda97065d35be7c8dd9f2234c9d97eefe5fa0d407d
 AUX pipe2azara 321 RMD160 c6ca09d178507af6dd2bff4bc8ad6765f4586b62 SHA1 96900b029b8bcdcc414b8e57877cac81d9aef95d SHA256 15fa8d6717e10e3e65d90d1bd89b81fb49a6b218923dc7d70234157c63286b0b
 DIST analysis2.0.7.1.tar.gz 18142642 RMD160 b345c8c8a3cbee549f0ddffbe76d208aa0a93b42 SHA1 f1cade41ce9d488926873bbc6f83fa79af7d9623 SHA256 8d37aa12a3e18a875dcce8689751144c5a949e3431395d00fdef49fbbb0f4d69
-EBUILD ccpn-2.0.7.1-r2.ebuild 4474 RMD160 6a0e6b59edee462eb5c84602e3f051072dbd1e33 SHA1 4c826b91fae29dc914f5359dff732c6bdfb74e18 SHA256 2fafd1212c4dce90524f1d0a6b579cddee33aaf2ea1244584a0cf439c948d9ce
-MISC ChangeLog 3006 RMD160 a922a222550403901f38cc888ff79f4fee39dba3 SHA1 a883aea3997e410cf03dee8d8caa8b0a033a8871 SHA256 782dc7086e32dbf245759a3570ad6d0312c1a65f3e1f8517fe7c2ba09b57f8c3
+DIST analysis2.1.0.tar.gz 18962012 RMD160 3997fe7deafd50142f60d036e82f436519efe1d0 SHA1 df86d54a13fa1c955f47889f1310b62edfd9dc09 SHA256 132ab4a39fdeedde24385b0c976adea43efd512fefcff7dd973790e9faaf9d95
+EBUILD ccpn-2.0.7.1-r2.ebuild 4550 RMD160 4adb7d8e25ae01b7c390475fa253e3408425e5fd SHA1 a177bc13e9f9da9f82e86acc6579ef3d11d227ff SHA256 e7f5ad42f1a095259c37ce9a6fe45a462fd105971b90719b3ad66cebe7e82865
+EBUILD ccpn-2.1.0-r1.ebuild 4126 RMD160 e0b81855a5380409a8c4447c2aa74fb191ced9cd SHA1 b31dccc9e29b521a633ebed983d3c36781127739 SHA256 3303fa844d2fa0343119893c68901f8c96b7e3df81978cb08faeb96ec287b964
+MISC ChangeLog 3319 RMD160 d6edf93c4b7738600640a1497ccd4198291b2306 SHA1 432d135a08b5833d14678229af67ee174f28f1f9 SHA256 64019e9ff1f1bbd5ac6460f50da1ba51dd10c4fad718ce3353187f2642ace041
 MISC metadata.xml 339 RMD160 2e62dd84c66f8229f9f75832b91b3921a23386c9 SHA1 3252b1e326b3ba201266861d6461bcc069ad770e SHA256 bbb58d377587da3e6a2d4a742829e24b2c840be26d8e8da2d3f6fbf26c0143ec
diff --git a/sci-chemistry/ccpn/ccpn-2.0.7.1-r2.ebuild b/sci-chemistry/ccpn/ccpn-2.0.7.1-r2.ebuild
index 07e712205..21d539e99 100644
--- a/sci-chemistry/ccpn/ccpn-2.0.7.1-r2.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.0.7.1-r2.ebuild
@@ -183,3 +183,8 @@ src_install() {
 		fperms 755 ${in_path}/python/${FILE}
 	done
 }
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	rm -rf $(python_get_sitedir)/${PN}
+}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.0-r1.ebuild b/sci-chemistry/ccpn/ccpn-2.1.0-r1.ebuild
new file mode 100644
index 000000000..938025d48
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.1.0-r1.ebuild
@@ -0,0 +1,170 @@
+# 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 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:^\(MAKE =.*\):\1 ${MAKEOPTS}: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
+}
+
+pkg_postrm() {
+	python_pkg_postrm
+	rm -rf $(python_get_sitedir)/${PN}
+}
+
diff --git a/sci-chemistry/ccpn/files/eci b/sci-chemistry/ccpn/files/eci
new file mode 100644
index 000000000..e5f4edee8
--- /dev/null
+++ b/sci-chemistry/ccpn/files/eci
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+export CCPNMR_TOP_DIR=gentoo_sitedir
+export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
+export LD_LIBRARY_PATH=/usr/libdir
+export TCL_LIBRARY=/usr/libdir/tcltkver
+export TK_LIBRARY=/usr/libdir/tktkver
+/usr/bin/python -O ${CCPNMR_TOP_DIR}/ccpnmr2.1/python/ccpnmr/eci/EntryCompletionGui.py $*