sci-chemistry/ccpn: Todays pthon patches

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 188 insertions, 15 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 853e603fa48d..66604699c05c 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/ccpn
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.127 2013/11/19 11:38:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.128 2013/11/25 08:11:30 jlec Exp $
+
+*ccpn-2.3.1_p131125 (25 Nov 2013)
+
+  25 Nov 2013; Justin Lecher <jlec@gentoo.org> +ccpn-2.3.1_p131125.ebuild:
+  Todays pthon patches
 
 *ccpn-2.3.1_p131119 (19 Nov 2013)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index f29a7e06755f..61b7fde03a79 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -41,6 +41,7 @@ DIST ccpn-update-2.3.1-131015.patch.xz 7676 SHA256 df46e2f39ff6a9feda6bd9d4480d9
 DIST ccpn-update-2.3.1-131018.patch.xz 8152 SHA256 03d51dd46b68b426dce8dcdc479add7a3c865c98da1528854538422ebfb93952 SHA512 cf396501bdabca724cf691cb35a7acaafc5b7253f15eaf6c286a52afbf629b1babadd837facbafe50d9a960699647640ffc009ae58da4cd1c288b752ce8a96fc WHIRLPOOL dbb69d3df269cd569939783963243496552b3ea551a5e7e4362d2815aad533142a884183ca1bed3af4c54933eb03e835cc9b46662dc8021705507eeabbb6b2d3
 DIST ccpn-update-2.3.1-131107.patch.xz 9316 SHA256 d01b8cdde7f459027b731649526fa8bd84ce3fff6a3e10df8b26bd3a52df80dd SHA512 c18784d29d7f15ddf74229d0a44162595d953db76663450101e2d65ca7834dafd0137c2f5742d66a7b89a4af57149f49ce0bb01e62c198da3c93ca3c6a4c2002 WHIRLPOOL ef571e4a279a15e434bd264d9f1213c610a79dc9d9e4c0318ac99b29213ee2018ca02617b62632a791f61b9c7479586567983a43c698f4423d90a9aaa554c7d1
 DIST ccpn-update-2.3.1-131119.patch.xz 9908 SHA256 c6098bed0078773a5a1adb91ed5c02d202845d9fe2a94481b0ea1e0556c2475a SHA512 30a3c7b203eb49de974de6eb5c466a82be58a7679bb0798770adf0011e05cde1130b79453ac407cb43c03f6be464db04b5bff3fddb5c09952ae182343253fcc5 WHIRLPOOL e8bfffda3d08c7fdbd00b905a9d8f6fca736f64b54ec39b6d31120381af2503e1cdf9f338cbcebe5eddf398b5eb4cc576147e9d7bfe06a44fd0a642e466a8dda
+DIST ccpn-update-2.3.1-131125.patch.xz 10160 SHA256 a386e70114b61de2957eccbfdd39f099606f82d0081949923cc68493e69df8d5 SHA512 20457e5b16d834f6c4d086b0fd6ebdd1b23756c170be6dd67766e153e6ed33fe4511a5f718ca99e6f44fc99eed00f90c3f34dc67c14047f89cefcbc100acbdd0 WHIRLPOOL 5d2f072a2ea2f4510172d633cad5de753401b536ff12e3dbe20a5df78feeb414c8457b3965744bb14f8f44fa586c099c095e0acf016aa4f7da47ec1883af250b
 EBUILD ccpn-2.1.3.1_p100806.ebuild 5181 SHA256 c3ba268461da63ea23ee7f621a8e4837a368eb3e4c85bcc5245250fb6b377b58 SHA512 701ea90a13dc44e5bf1ea17c0f69adea56b1c14788ab79c67fa4b9726cae532998717515568045aec9bb4e1dd4c352227130115d90c50bf07e7fd132cdee385d WHIRLPOOL 898a618f95b254785739e6fab20af333cb3a44bff12cd6840d1b111f1588a60e48055e8af7ca88457173452f6acba86ebd3bada96390211bc4cd063fe4160fd5
 EBUILD ccpn-2.2.2_p121125.ebuild 4612 SHA256 08a4b0682c049a6301138ea6f24d665edb0a8d8d709ed2c2f2529aa0a5e648a1 SHA512 f8c45f0b19a721775dab3147cced933e8db969e8443c15cd2bd2a31ffc3fcd0eda95acc75a93df5d0dd51dabd80fde8311a7b02bf3f6a051bc0855cb156755a5 WHIRLPOOL 427cacc0c080197cc79a867f1cf1d5bed45cbfbb0f8c5dc6456548218895ff25023ea30090e751af78b77fffd47f87f7aac3869a8ed13aa3727f2f12bac743b1
 EBUILD ccpn-2.2.2_p130110.ebuild 4649 SHA256 53125900943ea89ba3d3483de29a240a0e7282098af869a04bc926c34f3bf51f SHA512 8406a93562897aadfefd03e098b393af5fb29f9bfde8e5727b73ceb6cbe004b73cfd97b61e942189d9fba717761b20cc4914e5c9d858f36bbdbdeea1369490e7 WHIRLPOOL 112e9cab77898ef9246b127d5ef8529948cfaf91157a25bbe39899560af8340f8e5cbd1e2a3935dae083a9291f0d569d3cc5b7588dc2029f3342ecbe5590cb0f
@@ -63,22 +64,23 @@ EBUILD ccpn-2.3.1_p131015.ebuild 4685 SHA256 0215b6ff8c9ee7247a3b4fbb48a9c37f9e7
 EBUILD ccpn-2.3.1_p131018.ebuild 4685 SHA256 b8274f2e758b6e7c3416cb8d424f4c5b5472ecd61ea7b7c59db9194c65e8f26e SHA512 8acb386dff52261169bb0e1f219d14107a8ec28494e61c6263ae71ff968140300a99c74fca495aa75c57cd81e1adfd05ed44f80abcb2d63bfe9a635cff63a35a WHIRLPOOL 39688e03bf1cf9e189c1ad0cf349be0fa6895efffd4afa05f472881dc732f6f3e0ea90e7715b7709be713d20535aa20801a66f6f044894c93d6e1241623dec7a
 EBUILD ccpn-2.3.1_p131107.ebuild 4685 SHA256 e4cf9af1788357b96c1f8e805dbc19be0604af6b34cb983fe0aa735f95b6e290 SHA512 5ad8389563552d00b28ce067b76a592365e6d61a8d6aab85650e2c8031a60bfe912ee0f7bdfec536157e07a3e62bcf82735986e0faf5be3d52778a56d5c1596b WHIRLPOOL 6309bfd9355ed20089341820ff77bb8dc70100ebb937f9604a0222c85d070e4dd88e27693e6ab7c229fffdaa9a36cf531b54feb2c18f302e716191315d6f5318
 EBUILD ccpn-2.3.1_p131119.ebuild 4712 SHA256 304c3c6a3748eaa478d98b3af95668cef50262c5f6c7a872dbace8c828bca594 SHA512 678ea73d436550565828f682cf90382ed7f3fd166f9daea8643998781099a561899e7b6db5a53b691950f0c67440caabf3b087608db9532c17db2ac02e277c0c WHIRLPOOL 5f19462b456bae09a6983351c894735dd5c58f244154c8b30a54bda1d564d9728cb13fe779d47b46d2bbedb4a27fd7d575f73613fdcb10484b694ba6117e3d60
-MISC ChangeLog 24142 SHA256 ba4264a7cea98a8caae06642a1c6aa18d188723a2411f5f5f14f7adf2d3fc5e2 SHA512 ff99f8957c5b136a9076b9c0517be97bf96e261a7a90fbc04bdf32f167a69711c060e88063b64f4908f714998413bd68b42767f04be3cfb2f493102ba3b3f4f7 WHIRLPOOL 719334c759ee6cf7551cca53f76d2c2cc89d82438f422adaa0ad8003e7774b18fded26ecb88ba0d5c9d729608e4db0139ee596d92bdd56f7fee1c740254976cf
+EBUILD ccpn-2.3.1_p131125.ebuild 4712 SHA256 4b138cb7a05107ae9feeb6a2827fba1f385d32c0c822b49c779d7accc6546b92 SHA512 55f68c3eb94b7de0c70122e834c7a7506b9ea1a2eefc77c747bfe5576817d0f7c6371918f210b18722a13dde46ec7284335eb13631026987b42e9ffd51f29ed1 WHIRLPOOL 3305402cae34b506ce0917456928b905772773943cbb0fd6540c539ae78e784d6111d982e4c16ed87b81293851ff36cab52caea67e24cb316a92c3c7febc3ba9
+MISC ChangeLog 24276 SHA256 29b719a379c033d48068b664abe45fc3c7c116005ba59bac500c5d37f93df03e SHA512 da784e0c44cae6d4e693afa7e136bee85b6674e6da2681db3c1857882bba947c98171262c3f6cf682aba71407a749921e8bfd0631fdeeba4231adfa05550aa56 WHIRLPOOL 91c0f587adb6aed67825d0b9dcf11d8ab2b98589bafb972ab5e15403b3080d1c069e4778f8afa35f5896fda0910108b2d755ccb6e8724021de7510edd5c66fe4
 MISC metadata.xml 234 SHA256 8297e76ecd2cb828f604e9f138b263179eb84beb640215a0f60d7613eb46bb7f SHA512 0e94c0e6570a9267a39968d81c3b80680ccbc6eebb62199e4830b021a114c94a0de17ef2103cef62b7e27da1f51f225a30abb802aff82140ae6dc43366113d31 WHIRLPOOL fa6d4d90b092953b88ed3ad03e1e8c189296d268b39d13a4b4dcb78f0c4456341e3f1b44eea0860054fee43079179cb7cf7a912acf1fbe693ecdca6d9a65f081
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSi03DAAoJELnU8jG9FVirJrsP/RzYOiDOCsHhvHxlkVQtpuxn
-bT0N8aB6y+vB21ewXir1iRy1asnfKSaWhcNriCNVEgmULVexU653MCjtho6OqVTW
-JPawEviJS7wTEcXhDkeG+tSMdrfmIvORPBXAoFGhzOuQzWzJJvdBqJ7PTOnFq1gt
-GytkWQHO8sUeJlLBSbE4iYr+VtJOqJRzqlGba6+uIxVNnG+4lVfCN3cFRncrXPJD
-StEwT0DEbOOz2tp8Or116Rl997PDkU4PRQp4SzO79C8RrBha4Veu6YCBaJ/ZNQBR
-MlkaT8I2kx+5ew/SyMDboxh6m4zl+fFsroFTM/R3/ZVhzUwAG6ingmL3Ub7y7B5d
-o+bqrXnX3hmy2dgv13C9ycTspcKUe00SIMX126QPj0Qf7zYlozVE9zTixOpVeE3p
-rLK+jzFOjz24EoyjOIeJSgy32vkFj1q1CMTpqcw0zW8k7vVCAjdeIT4+GJWEibH8
-aS//lu/+NU/7LXbCHTxom2z7uB6GkpSMiz936LhFlen36DZQJnNctaanmiwDqxsm
-kX+xqXF0xg9xPYM/mQRAL6bIbDyDl9QnQoVsHggPfBRmdj+CB/+U8Qqp4DSIALLY
-PMgGrXrsUwftNxkNLmF1DmKWBopKrskUfhkfqC2GefrjdYW2EAd+OLK/tfV/XNo6
-KAWZ1eeRqfgNkwUP8ceG
-=6TNh
+iQIcBAEBCgAGBQJSkwYxAAoJELnU8jG9FVir8ZcP/06oo/xpaU94x6q6dyC2XLHR
+pqOnkxpWKnoS9Hgl74cLdxwrQu/zwUCWzkD8H3sRbFLguscjukbZb7P1c+s8DP2F
+dXVKmxR00OTgLTwBmGdOUVatMAtn3LHsA4fofUD/0dBvuoCtVDKdg/OearpNTfMt
+HnVWyltrt8VNivY6XCiHnaehbz61FzB4AALhlk4+0E3945GwsYJPorUkbBK1OKuQ
+2xr959aqtmnNMXSn41gRZzKIYkad1pXcndUrr5L2B72i1OoYhQszlAInp3WabkwM
+DD/OIFi8FU8OMmeo07gGrOwpfJbjSTFyqBJuBFKhymK/RQxg4Jv3Mp42Gf9eeaYk
+EA4Ggr9T0O4d4sd/slhja2HrOwsQCfpW69ZNPwvDPQxOT5M073jm6K8cH/0FQAyY
+zvGJCBqOTPAHedCz+/Wymc8IWzFl9dJ9IZ4agtPqxXNTwsg0jYuGkrlq98kK2nLT
+uFc77N2DuQSd9oEbwTjc/P7dkFfDgfHedPUPLmm6xjSkcLe/Awt+cKo1dlQ/4CuT
+8dHh7DgFpncjYZyabF1mGf4iiiDGxSB3q62HeHIKiJQwZU07vHD4ihYTqrAszJ6l
+Ro1z4Rgr8ZSNke8l2cH1XeitwOUCyjXGGngoDmXkqUsLM0M5qhf6BZPETrgJ840o
+6tH1T1QFUDjvozgUhe0D
+=Eqq7
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.3.1_p131125.ebuild b/sci-chemistry/ccpn/ccpn-2.3.1_p131125.ebuild
new file mode 100644
index 000000000000..fc4a54ed4907
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.3.1_p131125.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.3.1_p131125.ebuild,v 1.1 2013/11/25 08:11:30 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="ssl,tk"
+
+inherit eutils flag-o-matic multilib portability python-single-r1 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"
+HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
+SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}r2.tar.gz"
+[[ -n ${PATCHSET} ]] \
+	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
+
+SLOT="0"
+LICENSE="|| ( CCPN LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+opengl"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/tk[threads]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-tcltk/tix
+	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
+	sci-biology/psipred
+	x11-libs/libXext
+	x11-libs/libX11
+	opengl? (
+		media-libs/freeglut
+		dev-python/pyglet[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
+
+src_prepare() {
+	[[ -n ${PATCHSET} ]] && \
+		epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
+
+	epatch "${FILESDIR}"/${MY_PV}-parallel.patch "${FILESDIR}"/talosn.patch
+
+	append-lfs-flags
+
+	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 ${CPPFLAGS} ${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 =\).*|\1 -ltk|g" \
+		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
+		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|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 || die
+
+	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 extendNmr"
+	for wrapper in ${_wrapper}; do
+		sed \
+			-e "s|gentoo_sitedir|$(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|${EPYTHON}|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
+
+	dodir ${in_path#${EPREFIX}}/c
+
+	ebegin "Installing main files"
+		python_moduleinto ${PN}
+		python_domodule python
+	eend
+
+	ebegin "Adjusting permissions"
+	for _file in $(find "${ED}" -type f -name "*so"); do
+		chmod 755 ${_file}
+	done
+	eend
+	python_optimize
+}