From: Justin Lecher <jlec@gentoo.org>
Date: Fri, 9 Apr 2010 06:09:40 +0000 (+0000)
Subject: Todays Python Patches
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b4fc879d30ada5ffc8f07a6a5bd97bafd2a5dcd4;p=gentoo.git

Todays Python Patches
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index c258b37eb6db..67a38a483fde 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.23 2010/04/06 13:29:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.24 2010/04/09 06:09:40 jlec Exp $
+
+*ccpn-2.1.3.1_p100409 (09 Apr 2010)
+
+  09 Apr 2010; Justin Lecher <jlec@gentoo.org> ccpn-2.1.3.1_p100406.ebuild,
+  +ccpn-2.1.3.1_p100409.ebuild:
+  Todays Python Patches
 
 *ccpn-2.1.3.1_p100406 (06 Apr 2010)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index 97fd88c916fd..852e77915733 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -25,6 +25,7 @@ DIST ccpn-update-100326.patch.bz2 80654 RMD160 b42fe6eef14d8384e78a091f2fce6c53c
 DIST ccpn-update-100327.patch.bz2 81747 RMD160 ca6f704988f89caff0efaa69feac1c4e49c37c7a SHA1 52efe36493da8792addfa84375d96dae0d368ab2 SHA256 b4e3b80c2e29ea7d28b695ab5650de5f3098a2cf01faf3fa9caea57e52de9f74
 DIST ccpn-update-100330.patch.bz2 84490 RMD160 82a11b95cdf933b385c1554f3360bced5a26c43a SHA1 146e2243e9855ff43c22dcdb15bc1e7404f834a0 SHA256 a01f1c9396d05ba13da2d04fb7c670d1cbad6d3369afcc4b6b03e9c00b170e5e
 DIST ccpn-update-100406.patch.bz2 87475 RMD160 2a4e27ba091d53cf5728e3ed94a16c46f68ed85b SHA1 7dbd539a22a304428b6f2e2d44d58a2e8e4551d1 SHA256 3d5f49509fa8ee3bc8f91176d9338855526bc580e73d62fa2b7140c12502a38a
+DIST ccpn-update-100409.patch.bz2 96373 RMD160 a3df9d973c50762fd32e4c66d2776fea34ed3a2c SHA1 2e6d7ca27d21907334ca81ef2a85950916de2ff1 SHA256 61209c9e5381ed56ae037416c6b2346219d2ff782c86c2fd51acf4fccc925df5
 EBUILD ccpn-2.1.2.1_p100216.ebuild 4880 RMD160 e892baef0d74df30f40e5b393c893159bd08dda5 SHA1 e1a7a09588aa2f4e341e5d94f5260072dab10474 SHA256 7777534b663f05898cf40cc1f7114b2a6de38343fe5ab31f14d4c4c4f2456c47
 EBUILD ccpn-2.1.3.1.ebuild 4977 RMD160 12969caf3118f10fd0bd794f58d31be3e5c60c03 SHA1 dcdd685d5321ed97ea821fa6799e35d9b287e9dd SHA256 b55eb637a743dd0ad6c1a31b623c1c814019dcfc45f734996d3dec34a0ab5033
 EBUILD ccpn-2.1.3.1_p100308.ebuild 4968 RMD160 55570e8d965a301270dfbbeb525127c06a2fb13d SHA1 2e33e0da5337ff7fe2fcaf5f6c0cc0f0471714b9 SHA256 59fdc2733014cc89eaed8b3fe3692bfa1153d4697216b558c961ca6906a1f448
@@ -36,14 +37,15 @@ EBUILD ccpn-2.1.3.1_p100318.ebuild 4968 RMD160 fa68d224867dbf6449dbc00ad4f20fb85
 EBUILD ccpn-2.1.3.1_p100326.ebuild 4968 RMD160 2eee20a6e09949096b82d7ebe2844e7d75a358b5 SHA1 c5e3fb5539942e5f9cf9fa778e71f9085f89e545 SHA256 48827cac002bb1089db5b90930d54301a2fb6588460923583d0f08f4b8603a55
 EBUILD ccpn-2.1.3.1_p100327.ebuild 4968 RMD160 53bf882645e2d43f36eaa1b3ac1cc92c925693d4 SHA1 558e2ad76c2532ca829acceb024000a326dd1f37 SHA256 8ad862f5854757144ced77da479b15b67ff826a83082362219a1a288ce6bb3c9
 EBUILD ccpn-2.1.3.1_p100330.ebuild 4968 RMD160 bf9ac39e2530b2a133f499c9051fa84b7a9e12ec SHA1 73e12b3699514e5184a5b858611e0d7b6b5497a6 SHA256 a0efbcade813353ff33f049d9b841a47d9e978136a74cacd66f7e64cb29cb685
-EBUILD ccpn-2.1.3.1_p100406.ebuild 5102 RMD160 c4af0cc4cd1819f5c9fe4e7cca039ea489d0e415 SHA1 f86ae248b491c0da2a427499735fd28db3ae7c19 SHA256 2566688bf8816d1baf52d558efb36e9bde25baaa7c562e43cb861208dc9f5d34
+EBUILD ccpn-2.1.3.1_p100406.ebuild 5137 RMD160 4a85d2bb2e72679703beaff9eb013b3128257f1a SHA1 f7e173650d1370a7540354f1286142ddf9483267 SHA256 463d86bbafa1c0ec3f3b1be1bd9a7208690aff4d14545f85a03002116dfec9e7
+EBUILD ccpn-2.1.3.1_p100409.ebuild 5137 RMD160 b55196251759b32a75411e1ba35c97bb5c37bbbf SHA1 123e91b8bee4410fb057fee3706f7bc4e6900999 SHA256 08da3ae56257de82169a0ddbe83b52ba5211baeed02ab50d49c0cbbda259ef9a
 EBUILD ccpn-2.1.3.ebuild 4975 RMD160 99530170d2323e58cd105a5a8e47c493d0fd765c SHA1 5c298bffe292915768357e8273a1fb3d05312fb3 SHA256 1f9701c42f9e9754f0d8dcb258e3e365ec31f4e8d99b5649376083b7ff87bbb9
-MISC ChangeLog 4017 RMD160 6bce1f55b6a54991107fc3c9f3b41bd9027d24a3 SHA1 0dbe819922fb4bf2b987b50c77517281f03bfa3c SHA256 67e365e5b95dd3fd464a285795329b5b12058e5fa721fe3e893c2382cadec3c6
+MISC ChangeLog 4187 RMD160 c6f887af5c461e3f90867890c03a1f9bcfde5d10 SHA1 c4637be7746ea122f3d3c63e5a03e440fd63708c SHA256 ed9c742144a0b8e6310f003a561c2a30b6834c33fd8df1c4b6fe2ab8a605b657
 MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAku7N1wACgkQgAnW8HDreRZLdgCfUoyU4taE9BLsdgYU0+bOtfF+
-XO0An0DK6UrwPRhLxx7W9nXW187jG6Qx
-=mQ3k
+iEYEARECAAYFAku+xKoACgkQgAnW8HDreRYdlACeK40NfIn0nSWE3Y09G8LXXAfo
+fogAoKLSHENWQNRyCIDJwbQgGbzzdw1x
+=W4sc
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100406.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100406.ebuild
index c6529ed6e8a0..7801745a4d00 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100406.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100406.ebuild
@@ -1,6 +1,6 @@
 # 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_p100406.ebuild,v 1.1 2010/04/06 13:29:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100406.ebuild,v 1.2 2010/04/09 06:09:40 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -27,6 +27,8 @@ RDEPEND="
 	dev-lang/tk
 	dev-python/numpy
 	dev-tcltk/tix
+	x11-libs/libXext
+	x11-libs/libX11
 	opengl? ( virtual/glut )"
 DEPEND="${RDEPEND}"
 RESTRICT_PYTHON_ABIS="2.4 3.*"
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100409.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100409.ebuild
new file mode 100644
index 000000000000..bfff50587f50
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100409.ebuild
@@ -0,0 +1,186 @@
+# 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_p100409.ebuild,v 1.1 2010/04/09 06:09:40 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.gentoo.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
+	x11-libs/libXext
+	x11-libs/libX11
+	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
+
+	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:^\(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\$(PYTHON_DIR)/include/python$(python_get_version):g" \
+			-e "s:^\(PYTHON_LIB =\).*:\1 -lpython$(python_get_version):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}
+}