sci-chemistry/ccpn version bump to 2.0.7

3 files changed, 185 insertions, 1 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index f4872b412..e931f524f 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ccpn-2.0.7 (07 Apr 2009)
+
+  07 Apr 2009; Justin Lecher (jlec) <jlec@j-schmitz.net> +ccpn-2.0.7.ebuild:
+  version bump
+
   07 Mar 2009; justin Lecher (jlec) <jlec@j-schmitz.net>
   ccpn-2.0.6.1.ebuild:
   LDFLAGS are now respected
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index b7e21b502..ca317b6e7 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -5,6 +5,8 @@ AUX formatConverter 317 RMD160 6262b4673061bd8409dccdb58e218a495f7c33b9 SHA1 1a6
 AUX missing-link.patch 560 RMD160 17eec66581c4c120306464cd89486283fd1bfc89 SHA1 82198fdc32e22c488a679656c3cc6ac18c7e76ad SHA256 db5518683e254304f8de1420b102bfe08051839666a9edf2529d3235946ecd88
 AUX pipe2azara 321 RMD160 481fc373c88e568c909cf7759740f3ab6e0be694 SHA1 33972857600b54c5806befb86079af4bdd759121 SHA256 318dffebaad08cd448e64660ba0cfbf8df341b2b5e554e66b7ed27a9a1a2dcf9
 DIST analysis2.0.6.1.tar.gz 17350243 RMD160 97ee6fa30fdcf1f4f237ab40f20086e5bb3c7f9f SHA1 1b42c0178e7007a5ff57c7554cb4c9caff8e8048 SHA256 b7446fb95e9bf6b49aed42b4a89a9efb4779b7823b4a91297307a5178a5d5ede
+DIST analysis2.0.7.tar.gz 18131046 RMD160 4d9f81179c7a4f4787a819ed5046ac18848d9557 SHA1 d12972255e0f1df9d347732ef85434fe07b1b5b9 SHA256 84bce24e110e83ec6bac1e35c80c3f4343737da4c1b1cfb39f9191a2bbc51c24
 EBUILD ccpn-2.0.6.1.ebuild 4259 RMD160 de959ec6374bf6b3d69d9cb273a2eeabe48c3d59 SHA1 7b7eac19520900a6ef1efb658127509ddc8b2172 SHA256 826e12983a6e9cd98c369c31f95246daead75d5a06d67f238bedca7f7789722e
-MISC ChangeLog 1843 RMD160 d09b32b464be759117bd99bc58cc72cb50206d5b SHA1 cf7d8924ef0f7a8fb1c0c6be076fa5b3458275fd SHA256 19139f4b3e6547d8b14184999a051d24371265768f81ed238791022cf061a460
+EBUILD ccpn-2.0.7.ebuild 4259 RMD160 de959ec6374bf6b3d69d9cb273a2eeabe48c3d59 SHA1 7b7eac19520900a6ef1efb658127509ddc8b2172 SHA256 826e12983a6e9cd98c369c31f95246daead75d5a06d67f238bedca7f7789722e
+MISC ChangeLog 1963 RMD160 a1f229ac38c192722016927d90529afa66e73ec5 SHA1 8939aff0e728bfb96eca81474827be229e48d650 SHA256 7bd5e4c4d52855e22ca4632911edfbade4f69f668d4a8b77ea2b3852208d7bd2
 MISC metadata.xml 339 RMD160 2e62dd84c66f8229f9f75832b91b3921a23386c9 SHA1 3252b1e326b3ba201266861d6461bcc069ad770e SHA256 bbb58d377587da3e6a2d4a742829e24b2c840be26d8e8da2d3f6fbf26c0143ec
diff --git a/sci-chemistry/ccpn/ccpn-2.0.7.ebuild b/sci-chemistry/ccpn/ccpn-2.0.7.ebuild
new file mode 100644
index 000000000..9bf15f7fa
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.0.7.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+NEED_PYTHON=2.4
+PYTHON_MODNAME="ccpn"
+
+inherit python toolchain-funcs portability distutils eutils
+
+MY_PN="${PN}mr"
+
+SLOT="0"
+LICENSE="|| ( CCPN LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86"
+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"
+IUSE="doc opengl"
+RESTRICT="mirror"
+RDEPEND="${DEPEND}"
+DEPEND="virtual/glut
+	 dev-tcltk/tix
+	 dev-python/numpy"
+
+S="${WORKDIR}"/${MY_PN}
+
+pkg_setup() {
+	python_tkinter_exists
+	python_version
+}
+
+src_unpack() {
+	unpack ${A}
+
+#	epatch "${FILESDIR}"/missing-link.patch
+
+	echo "" > "${S}"/ccpnmr2.0/c/environment.txt || die "failed to kill environment.txt"
+}
+
+src_compile() {
+
+	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"
+		GLUT_NOT_IN_GL=""
+		GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
+		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"
+		GLUT_NOT_IN_GL=""
+		GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
+	fi
+
+	cd ccpnmr2.0/c
+
+	emake \
+		CC="$(tc-getCC)" \
+		LDFLAGS="${LDFLAGGS}" \
+		MALLOC_FLAG= \
+		FPIC_FLAG="-fPIC" \
+		SHARED_FLAGS="${LDFLAGS} -shared" \
+		MATH_LIB="-lm" \
+		X11_DIR="/usr" \
+		X11_LIB="-lX11 -lXext" \
+		X11_INCLUDE_FLAGS="-I\$(X11_DIR)/include" \
+		X11_LIB_FLAGS="-L\$(X11_DIR)/lib" \
+		TCL_DIR="/usr" \
+		TCL_LIB="-ltcl${tk_ver}" \
+		TCL_INCLUDE_FLAGS="-I\$(TCL_DIR)/include" \
+		TCL_LIB_FLAGS="-L\$(TCL_DIR)/$(get_libdir)" \
+		TK_DIR="/usr" \
+		TK_LIB="-ltk${tk_ver}" \
+		TK_INCLUDE_FLAGS="-I\$(TK_DIR)/include" \
+		TK_LIB_FLAGS="-L\$(TK_DIR)/$(get_libdir)" \
+		PYTHON_DIR="/usr" \
+		PYTHON_INCLUDE_FLAGS="-I\$(PYTHON_DIR)/include/python${PYVER}" \
+		CFLAGS="${CFLAGS} \$(MALLOC_FLAG) \$(FPIC_FLAG)" \
+		GLUT_NEED_INIT="${GLUT_NEED_INIT}" \
+		IGNORE_GL_FLAG="${IGNORE_GL_FLAG}" \
+		GL_FLAG="${GL_FLAG}" \
+		GLUT_NOT_IN_GL="${GLUT_NOT_IN_GL}" \
+		GLUT_FLAG="${GLUT_FLAG}" \
+		GL_DIR="${GL_DIR}" \
+		GL_LIB="${GL_LIB}" \
+		GL_INCLUDE_FLAGS="${GL_INCLUDE_FLAGS}" \
+		GL_LIB_FLAGS="${GL_LIB_FLAGS}" \
+	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
+
+	insinto ${IN_PATH}
+
+	ebegin "Installing main files"
+	doins -r ccpnmr2.0/{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
+}