Today's python patches added

Package-Manager: portage-2.2_rc63/cvs/Linux i686

3 files changed, 194 insertions, 5 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index a0d5a5e71de1..d832f669c2ae 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/ccpn
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.9 2010/02/25 08:54:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.10 2010/02/26 08:20:13 jlec Exp $
+
+*ccpn-2.1.3.1_p100226 (26 Feb 2010)
+
+  26 Feb 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +ccpn-2.1.3.1_p100226.ebuild:
+  Today's python patches added
 
 *ccpn-2.1.3.1_p100225 (25 Feb 2010)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index 1717cae61f83..8296259f6bd3 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -17,16 +17,18 @@ DIST analysis2.1.3.tar.gz 18917835 RMD160 068fed988cb20d899266680f7dd7af2ca1ae2b
 DIST analysis2.1.3_1.tar.gz 18932918 RMD160 5f19ea6fe47c2910d16fcba8d1a78f0e1dead731 SHA1 683bdfb17d14979eb6477aaa99e4c4af5003beb2 SHA256 bbc1ba5434f896d38b6745c1dc9adc470a78d3be7b879160edcd635a19228b74
 DIST ccpn-update-100216.patch.bz2 37914 RMD160 92d2845f9a21a5ddc9fd71cf56928b61f497530c SHA1 de61701435675d10165826cf4cd590dca336cbb2 SHA256 13e062188e953ea62e779b7d89004ce103db61daf228cf6b9f7d3c77f39947fc
 DIST ccpn-update-100225.patch.bz2 2997 RMD160 0ba3740a8bd103ed783ce253887425aad4e3de2e SHA1 9adc0ca7ac7e0d05ee50af3dd62ee61395e6c9c1 SHA256 bdb9a3e27ad448a42bb8e7b2e512e61389f233a68676fbb28c28b669a276413a
+DIST ccpn-update-100226.patch.bz2 10041 RMD160 7ba3c7c151bf1f69938bcd49edb02c1b3a77e240 SHA1 49a68a07288fbbf5f6c42e6a694a5ee811626354 SHA256 e3de673a86948ad2ed0bbf0abe2e56019dc66bb0802f56ae8a6f66123de764d9
 EBUILD ccpn-2.1.2.1_p100216.ebuild 4886 RMD160 d8e6a014c77a7ce40c40ae46416c2d5c15c14b09 SHA1 8e47f0a495d720eda820f94baca5b1088b26b4a8 SHA256 5478960144f864ebdcd57048084d54bfa6c0d59350223ab9404715fb36bdabd4
 EBUILD ccpn-2.1.3.1.ebuild 4983 RMD160 6530d19fe8905994325cba9515018d6f4078058a SHA1 197b2cb667c181c984a2a3f76db2361197c346ed SHA256 7c8db3232b161439abdb6581cb12caaef5b109664339f9fcc3dad7eddee752da
 EBUILD ccpn-2.1.3.1_p100225.ebuild 4990 RMD160 2ccd3cf192c5db7453dfa585df5062803a025f8c SHA1 b354525321542d2786e98edfa77a3aec64f184ad SHA256 461812471fe6c0c857fdc98bc4410f0d2c8e1651375d770571e1283542690124
+EBUILD ccpn-2.1.3.1_p100226.ebuild 4990 RMD160 5c5d16f89fb7e9cd1738396d839c352bdef45406 SHA1 b3b141a811e623f76e9b23aacaa24accd8ff210e SHA256 5dfa2d78885659db5daa8e71ea7942ab8e4593b32a3e43b198b56583c090cafe
 EBUILD ccpn-2.1.3.ebuild 4981 RMD160 9404d1d8ee7c1638f024b9ea1b0de703510fcd64 SHA1 f2f1fd6496af93b8dc59affa6e9ed8188b8bcc84 SHA256 2411dbdc3631aa2606d6a6780fefaa02f6c1d66626b0321c7567136e769ae47c
-MISC ChangeLog 1739 RMD160 035bb3d41e7ba80d222e0568606cd023d09a613b SHA1 66a1db7067e36cbc028a20eecb6518ecf71833f9 SHA256 5c87d8e6c4c12ec5a69add3efa16a23096da1c197efe11f70b636deb5f2848fe
+MISC ChangeLog 1898 RMD160 06e9163c3f581719c0b916b034c7fecc7a28b947 SHA1 60c3776309f42c9d902b4bf421d31851af53d66b SHA256 7a55698829a395436fad40c98df205b95a4281e1225a31a871e6a89fada6d729
 MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuGOt0ACgkQgAnW8HDreRboHQCgyo47L6XM8CpdKEHWHy/5gCYU
-qloAoMWNkiVYgTN3XqI9rVuHh37xtHro
-=sItN
+iEYEARECAAYFAkuHhEoACgkQgAnW8HDreRaI3ACfToHNVnlA/mPwzJCl+i0oOjIC
+ADEAoMuh3+DRHjUwY+VZ4ow7NY+raUbU
+=9mW4
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100226.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100226.ebuild
new file mode 100644
index 000000000000..7533e201ad8b
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100226.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100226.ebuild,v 1.1 2010/02/26 08:20:13 jlec Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+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*})"
+
+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.gentooexperimental.org/~jlec/distfiles/ccpn-update-${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="+opengl"
+
+RDEPEND="
+	dev-lang/tk
+	dev-python/numpy
+	dev-tcltk/tix
+	opengl? ( virtual/glut )"
+DEPEND="${RDEPEND}"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+RESTRICT="mirror"
+S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
+
+src_prepare() {
+	[[ -n ${PATCHSET} ]] && \
+		epatch "${WORKDIR}"/ccpn-update-${PATCHSET}.patch
+
+	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
+	epatch "${FILESDIR}"/${MY_PV}-dynamics.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_FALSE"
+		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)"
+
+	python_copy_sources --no-link
+
+	preparation() {
+		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:^\(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\$(PYTHON_DIR)/include/python$(python_get_version):g" \
+			-e "s:^\(PYTHON_LIB =\).*:\1 -lpython$(python_get_version):g" \
+			-e "s:^\(GL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \
+			c/environment_default.txt > c/environment.txt
+	}
+	python_execute_function -s preparation
+}
+
+src_compile() {
+	building() {
+		emake -C c all links
+	}
+	python_execute_function -s building
+}
+
+src_install() {
+	local libdir
+	local tkver
+
+	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:${EPREFIX}/$(python_get_sitedir -f):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" \
+		    "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
+		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
+	done
+
+	installation() {
+		local in_path
+		local files
+
+		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}
+		done
+
+		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
+			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
+	}
+	python_execute_function -s installation
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}