sci-chemistry/ccpn: Todays python fixes

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 192 insertions, 5 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index d77859014e47..1c7c610dbc7c 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/ccpn
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.88 2012/07/31 07:20:05 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.89 2012/08/09 08:31:15 jlec Exp $
+
+*ccpn-2.2.2_p120809 (09 Aug 2012)
+
+  09 Aug 2012; Justin Lecher <jlec@gentoo.org> +ccpn-2.2.2_p120809.ebuild:
+  Todays python fixes
 
 *ccpn-2.2.2_p120731 (31 Jul 2012)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index 240bff85696a..d514a54e6ca0 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -26,6 +26,7 @@ DIST ccpn-update-2.2.2-120423.patch.xz 14736 SHA256 b9a91a5d6ff421800383a3347112
 DIST ccpn-update-2.2.2-120511.patch.xz 16728 SHA256 01ce6f8fe051921c0b05d4e5cc47b57fd6f74cd3cbd01f9d419e899295e00363 SHA512 d7ef01158ad86acf48fb6665209f448ba2b3d7353b57cc76166812deca5e8bb3317089226698c3050cbb1b73cef07f7960b08a6bf2e5a93a62b4d1b5e17be343 WHIRLPOOL 5c19d20f1aa1781bb3c120b114ab8f6954ecb3815635a46b2688c122de4af250fed7215cb522f109427432727ed4209a4f3364b6384abf269e22ebdec87d0d35
 DIST ccpn-update-2.2.2-120709.patch.xz 36136 SHA256 b51c9517a8bc493402dfa73f8d0a95fa5f3e2e4878a1835ce1c1d305f4b0aa4f SHA512 3ca122ca3201ad9576d6b01900cd298af5e01d8ed42054b5d8e17a75ac77fa965e00bd423d3e32f919b63d8a9157744705bd4265e257d4e5da9f036b3b16e419 WHIRLPOOL dff03e0d7f5f9175b765af700821901e8d2d475149b94b65f3919304bf67ebef823445f262b845127710916e101185fb946c9496578edde7e6770be0437b9587
 DIST ccpn-update-2.2.2-120731.patch.xz 43592 SHA256 73949616d170606b7ebb12d24f409bbef82515fad4fedd1877894944f68fff36 SHA512 7b1163ca7ad7a1fcaa0dc4433b9f3a254429b5df80ae5fb4b7988b23d65351a15a9629970959f8c4bfaf8570d375bf229f9243dc29230c1797b124e95cea9d78 WHIRLPOOL f5b169a776348de9e91c83fa3f2035eecb3d5caea96af2f85945adeba7fa8641e931b404bf0b8c17966a02d92413b091774720811fccc35ed0c7d992e4001cc4
+DIST ccpn-update-2.2.2-120809.patch.xz 44892 SHA256 f4837a984165cc708a0ece8ef63b5558243acfb8061f6930cc6c25160a6be76c SHA512 0ad9271691d9f26fc602b8a56c18cad5640baf7f274cbbe2f9627f5432504b6a4a3d02936d19e8aa776c331b90d7b52d08348c9da3f8dca9e2dacb3a538546a5 WHIRLPOOL 2b4cc8d372de5b725badd1e934254159c57d40b630e37760e9f0b00e667951b777f372c8c8fd7a82a173bd2e80b2067205e1603e77d8102f5f38b72ba67aff14
 EBUILD ccpn-2.1.3.1_p100806.ebuild 5181 SHA256 c3ba268461da63ea23ee7f621a8e4837a368eb3e4c85bcc5245250fb6b377b58 SHA512 701ea90a13dc44e5bf1ea17c0f69adea56b1c14788ab79c67fa4b9726cae532998717515568045aec9bb4e1dd4c352227130115d90c50bf07e7fd132cdee385d WHIRLPOOL 898a618f95b254785739e6fab20af333cb3a44bff12cd6840d1b111f1588a60e48055e8af7ca88457173452f6acba86ebd3bada96390211bc4cd063fe4160fd5
 EBUILD ccpn-2.2.1_p120109.ebuild 5784 SHA256 b4b08ff9094119e5bd50066f72d41927bd3bbe840c0985f49c585501925ba593 SHA512 37ff9cb372f395cb0497db2bf396e523b7a1ec16f03670425b6f5807a7ab15eae4718fd248af81ef9fdf5c4fbbd4f824d1d9c982c3aa9aefa57ce330b438b559 WHIRLPOOL b3b42229f7d32caffe7f81ddefbdce225438c07c203c67ee1a514e48b923e014166d3fd63601a4d9f2845c4b4aa9b8df98aa65e5c3dfc81ab1f0d7ac501eb6a2
 EBUILD ccpn-2.2.1_p120304.ebuild 5784 SHA256 387882b2a69b312bfe9d7edaaf8a2dc399e1d3d16f62e3b250d91207e64c3f72 SHA512 63596f039c56d69815d9250581dd41c61309a277e67d1ede04b7c4cdf7249af614e5a9f653d013bd2e63d25f54e3f07e9612efde04a39d141c6a202123211b3d WHIRLPOOL 87400bca5581904c5f0e0f43ca3bd375338f46082236128e01b93edc4ce791fe71da8e3c3b625ea7346d824ddfd9f2f57696642abbcaea5f29405e9b99f43b37
@@ -35,13 +36,14 @@ EBUILD ccpn-2.2.2_p120423.ebuild 4799 SHA256 5a9d2bc41515c2b1a05f5938b6719c80b5f
 EBUILD ccpn-2.2.2_p120511.ebuild 4799 SHA256 02a0cf33a3cf98f798e4f9eea7f4febad9a8d17bf172bbcfdb224de7f25d9917 SHA512 a3f1ae965cfd028814ea1055f4ec646941ea29bbdc69669f810d3272494bd6dceddcc16cd156436094b9d62e2c800808b66336997657be535f8474c4f50fad2f WHIRLPOOL 0a4b9baeec245e9990c631d6de59231e1da9aaab05fc938a9c74695e979b6cb75557b50a8c7d7271386c08da27bde0e9558c3330d62b71f7c0bf4d67d1c280d4
 EBUILD ccpn-2.2.2_p120709.ebuild 4799 SHA256 c757f21a728d4321577fcee7f3ee2346d68225aded0415ef5cf19a63f4f78fcc SHA512 7ce0c39f08f071bea1b3f7b84df61155e84d0d902d4ea097fe60e48b96a216976adb1161ebfcfd06089b91004ca5186dd9920a89fd7542fb0857db65b7124f5f WHIRLPOOL 7b3544a39be0826a5a64114e8d3c20816c8bd224fc1be39a726d441f25ffe4ee561340fe4db5612945da34a0c8d0c215cabab663368285b879b42df25f857fbe
 EBUILD ccpn-2.2.2_p120731.ebuild 4799 SHA256 e995094ac244da2cc73f519f6dc736edeba4d17ec863664e404a92c11a324483 SHA512 6861ac7f14559109593e3f166a7128c7c29135f84bdc12df04602181b36402b8446d762883c97f4c48ddc1995bed6cdfbc11ecc05e2bf8763655760ec59666b5 WHIRLPOOL b46af9e9b039fd7d702e113d612169bd38691504ae7a46a98f11281f0de6dcbd00d1c34d3b404a27f180d553a4f0e9b38477bfd1bb8eed4757e4540775d5152b
-MISC ChangeLog 17750 SHA256 adb0c8b46aaa625053814c12c469cc25d649cb55a0715f529476b8c373f583a4 SHA512 927467a30269dc151682b0296d254f09c0e1abe76f750314824085b830637ced7ad07fb400374a45308d5759b1c3d2e2447f0891ddee777520b8575ee74cc515 WHIRLPOOL 86440ace4ae925b6cbf0267e78f7c61fd2ec2fc641004f24cd0dc8a4aec5e3867c4fca4c1e2abab4eae3435f500c2d5e541178c3b1a7a43fc66498f0a61558ea
+EBUILD ccpn-2.2.2_p120809.ebuild 4799 SHA256 acc30dc5697955dedbbf43f857f453b53063589ccdc5a5fb21d72c7838d8aae7 SHA512 87778e8d9d0cc6da228b329a482e0af72e8e1dfa711598a4e5be2c537f8a0ce223248b7ac05eb9aa86eb4daa03ebb34eda3ca9f9d6e6b191e9e205efba159070 WHIRLPOOL a61cecaabb63728533825fba4d12656ef552fd7ce6b9c0466849c911299fd617e7c1e48617e531b65a078d3dc1a9c84a1cb1e89962be728c20d0f186f6f498d5
+MISC ChangeLog 17883 SHA256 a7663fb4c224bb9f79db9c3805de8ba506ad1b375c7e44dc69d8ca1911cabb5e SHA512 9286d785acbeff65ae0bd10e28a059dff7ebe5bf198394322232b391c0f0e7bc528bc7640c5fd2c3c6089f527c67c39fe5adc38338ea69722ca9274a031727d6 WHIRLPOOL f3e38affe344d362e180e7708bf49ac37233bf1ab3d116720616b674f9f5c43e825e49f73a6adb5b1305130bd48290da4d842adb9fc2621f903d4b1f0ea153fc
 MISC metadata.xml 322 SHA256 7468ba4c27b879e7ed5f82274f5837e51f1f389673a33b9e26e1756a6b0783df SHA512 01933ddaa7b2ab20fd0c07ba6725c162dc9e0512275c91ff657732a69135f1ca7cb3ce39002b4e386aedf27fca26c086f80d31bd8a0821b696c9b99f59c140a4 WHIRLPOOL 1bd202323ff47b3fb34ca4cc6c89567b69a480d38abbcf1a140cbf8f316ebad8b7f95b4525ac261174e1b94555644cdb791dc532398b8f2fbf3cce74283d8ef8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlAXhyoACgkQgAnW8HDreRYo8gCfUfZG9LdBHrKfs/ZyoBIWorJM
-bKUAn1QzIOwxuniLgnHoMIKK65A5v0Q6
-=KQkU
+iEYEAREIAAYFAlAjdVkACgkQgAnW8HDreRblKwCfepeg0ne7fX99VBNr41JZQC0P
+PkkAoKLnlAfrjm8QMxI9yIayesxDm3i4
+=ETw3
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.2.2_p120809.ebuild b/sci-chemistry/ccpn/ccpn-2.2.2_p120809.ebuild
new file mode 100644
index 000000000000..5170cd025cd1
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.2.2_p120809.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.2_p120809.ebuild,v 1.1 2012/08/09 08:31:15 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.5"
+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*})"
+MY_MAJOR="$(get_version_component_range 1-3)"
+
+DESCRIPTION="The Collaborative Computing Project for NMR"
+SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
+	[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI}	http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
+HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
+
+SLOT="0"
+LICENSE="|| ( CCPN LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="extendnmr +opengl"
+
+RDEPEND="
+	dev-lang/tk[threads]
+	dev-python/numpy
+	dev-tcltk/tix
+	=sci-libs/ccpn-data-"${MY_MAJOR}"*
+	sci-biology/psipred
+	x11-libs/libXext
+	x11-libs/libX11
+	opengl? (
+		media-libs/freeglut
+		dev-python/pyglet )"
+# We need to fix this
+#		sci-chemistry/mdd
+DEPEND="${RDEPEND}"
+PDEPEND="
+	extendnmr? (
+		>=sci-chemistry/aria-2.3.2-r1
+		sci-chemistry/prodecomp )"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	[[ -n ${PATCHSET} ]] && \
+		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
+
+	epatch "${FILESDIR}"/${MY_PV}-parallel.patch
+
+	sed \
+		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
+		-e "s:weights_s:weights:g" \
+		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
+
+	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_TRUE"
+		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)"
+
+	rm -rf data model doc license || die
+
+	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${EPREFIX}/$(python_get_includedir)|g" \
+		-e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
+		c/environment_default.txt > c/environment.txt || die
+
+	sed \
+		-e 's:ln -s:cp -f:g' \
+		-i $(find python -name linkSharedObjs) || die
+}
+
+src_compile() {
+	emake -C c all
+	emake -C c links
+}
+
+src_install() {
+	local libdir
+	local tkver
+	local _wrapper
+
+	find . -name "*.pyc" -type f -delete
+
+	libdir=$(get_libdir)
+	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
+
+	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
+	use extendnmr && _wrapper="${_wrapper} extendNmr"
+	for wrapper in ${_wrapper}; do
+		sed \
+			-e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|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|$(PYTHON -a)|g" \
+			-e "s|gentoousr|${EPREFIX}/usr|g" \
+			-e "s|//|/|g" \
+			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
+		dobin "${T}"/${wrapper}
+	done
+
+	local in_path=$(python_get_sitedir)/${PN}
+	local files
+	local pydocs
+
+	pydocs="$(find python -name doc -type d)"
+	rm -rf ${pydocs} || die
+
+	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
+	sed \
+		-e 's|#from __future__|from __future__|g' \
+		-i ${i} || die
+	done
+
+	insinto ${in_path}
+
+	dodir ${in_path}/c
+
+	ebegin "Installing main files"
+		doins -r python
+	eend
+
+	ebegin "Adjusting permissions"
+
+	for _file in $(find "${ED}" -type f -name "*so"); do
+		chmod 755 ${_file}
+	done
+	eend
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}