ccpn update

3 files changed, 176 insertions, 1 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index f9ed525ad..ee1b9ecff 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ccpn-2.1.0-r3 (11 Oct 2009)
+
+  11 Oct 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +ccpn-2.1.0-r3.ebuild:
+  Upstream update from 11/10/09 included
+
 *ccpn-2.1.0-r2 (09 Oct 2009)
 
   09 Oct 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index d0c56d2d8..b5f24c059 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -7,9 +7,11 @@ AUX pipe2azara 321 RMD160 c6ca09d178507af6dd2bff4bc8ad6765f4586b62 SHA1 96900b02
 DIST analysis2.0.7.1.tar.gz 18142642 RMD160 b345c8c8a3cbee549f0ddffbe76d208aa0a93b42 SHA1 f1cade41ce9d488926873bbc6f83fa79af7d9623 SHA256 8d37aa12a3e18a875dcce8689751144c5a949e3431395d00fdef49fbbb0f4d69
 DIST analysis2.1.0.tar.gz 18962012 RMD160 3997fe7deafd50142f60d036e82f436519efe1d0 SHA1 df86d54a13fa1c955f47889f1310b62edfd9dc09 SHA256 132ab4a39fdeedde24385b0c976adea43efd512fefcff7dd973790e9faaf9d95
 DIST update-091009.patch.bz2 34169 RMD160 b37270eeaaa20bb7adb30bcf8049668f753d74fb SHA1 e846a7a43c72b3daaaf018f44914e6d784f4c6e8 SHA256 0b5e642314fc80c6cc082cfd0de3a7a99285d666cb4ee168053ea12baf691e29
+DIST update-091011.patch.bz2 35654 RMD160 3fa6d0de6a0d9189dea5ca30c5ef3a61b67a8d95 SHA1 fde71ab0b3c0410c88282c71bb73287b2448bff7 SHA256 94ed5da0cb2a61b7e96dfccfb75a9274c2946da9557dbf531f3d0fa09570bf56
 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-r2.ebuild 4167 RMD160 c3bb757cbf4865d2fc133b2b5afee6964ad1948e SHA1 050f55e463f1597a5fb9c269cf8284d6233e7894 SHA256 3d6d1c4bad3c325d80ac474a05b1be12806d025477018bb466afb78fcc480027
+EBUILD ccpn-2.1.0-r3.ebuild 4167 RMD160 ec4c40b881c168d6c595d13a7209df7700f39467 SHA1 2fdb1b8d60851333fd0c10ee7c1c4213ea0e9f4d SHA256 8388725af7e585f778c2b34ae49c9cced756cad301e830b8ffb619d93aaf95ec
 EBUILD ccpn-2.1.0.ebuild 4546 RMD160 86a4d9260ca3aa7a401e5b311bc336794d14f311 SHA1 1220889c05b6e9ba814ffa32d83360ed3eccf471 SHA256 afc425f1e75a995322972a51f899d52d69610953d5e59cdb968277695b54ab87
-MISC ChangeLog 3493 RMD160 53047c4fb2967d3bcbfb63fb80e713d43b03652c SHA1 c9f4f9302a385608e8ba796b1481a41a4d695874 SHA256 7f2f02b06550012f1bd31cbf6362a0dc2f24593eb3dca4acb727a3062d31119b
+MISC ChangeLog 3647 RMD160 036aeef3fd3cff7d0de002f59cd4ce0892783f0b SHA1 e29270572ecf3ae26d0d62c8b6c58821ae2d678f SHA256 1dc39de7daf778ba788ba5a62a17b4e83cd51d6577c223f4c7ace292bac435f2
 MISC metadata.xml 339 RMD160 2e62dd84c66f8229f9f75832b91b3921a23386c9 SHA1 3252b1e326b3ba201266861d6461bcc069ad770e SHA256 bbb58d377587da3e6a2d4a742829e24b2c840be26d8e8da2d3f6fbf26c0143ec
diff --git a/sci-chemistry/ccpn/ccpn-2.1.0-r3.ebuild b/sci-chemistry/ccpn/ccpn-2.1.0-r3.ebuild
new file mode 100644
index 000000000..a0666aa1b
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.1.0-r3.ebuild
@@ -0,0 +1,167 @@
+# 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() {
+	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
+}