sci-chemistry/ccpn: Todays python patches

Package-Manager: portage-2.2.0/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 10c03c998694..796172391561 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.114 2013/08/13 10:27:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.115 2013/08/14 07:46:36 jlec Exp $
+
+*ccpn-2.3.1_p130814 (14 Aug 2013)
+
+  14 Aug 2013; Justin Lecher <jlec@gentoo.org> +ccpn-2.3.1_p130814.ebuild:
+  Todays python patches
 
 *ccpn-2.3.1_p130813 (13 Aug 2013)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index c0563d1d6fa8..b28a34c3255a 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -29,6 +29,7 @@ DIST ccpn-update-2.2.2-130530.patch.xz 241280 SHA256 9d6d1e4646f45f9857128c20e89
 DIST ccpn-update-2.2.2-130618.patch.xz 242764 SHA256 c605c92a547e50e64f5c97ae5eee5fab82728b1b0f1ab6170ce93f477e03096c SHA512 0b0bc5ee4860a6979d65b07fafe1747b6794a9197d28aa56f8bf121ee56a1a343f8c6cb65e7d93736afa9b3b4893d3ad692415bb75b4ce4d11b3e56033c4dc40 WHIRLPOOL bc6539af061085a03348e385527bdb4e2f79d27afd2dde5b50234a8940ff075ff58326b11371d1e5c154380f7d9cae060f2d72a57a52481990ca20ac6248b65f
 DIST ccpn-update-2.2.2-130705.patch.xz 248520 SHA256 12951d154579b23e110f4f326fe880c998ca0027aaddfb602a4eceb9b493ee77 SHA512 6fa4f6e83ac5d02b74d36ba9eea311c4c5764b5898280310ab9e0ba8f580ae53bbce17da49990aaf82e67b389019e0836534463777f8c6c0245cf51901a562f7 WHIRLPOOL 8fff3c93e8f985b36bacc00142b8289e9ef0a3726f5b9bc8d6be70c5ee1b3cffe3c504ce935ae219d98fb9500c56cd4e3b86a7397f70fc30378cae455315d5e9
 DIST ccpn-update-2.3.1-130813.patch.xz 1108 SHA256 5f6b5c5e1d5bb221585f23e7e60484ec35a07d418a2b0ff0cd2d26a3974c2e54 SHA512 b4afc4d8a2ee8ea1c1883055960ac9d14ec2496b26c2966f1a972ee7d46c1d484a11badd639426d9c2afa09b259ff125c34346355ea79ab5393936df22aa60c7 WHIRLPOOL 12bbc548b7d871bf0c6a836067209e13671aeefc66f3d8a326256bf5bfa4c15858acac0c5d7bcd8a69bf6218a010058b7497d7b6a5385868df92236200aec50a
+DIST ccpn-update-2.3.1-130814.patch.xz 1308 SHA256 67e29aa7e4c43b2249d230937e8b8ba25991de9dadc57ac9f8e30f0712591546 SHA512 2ec9f81ce5a6607f227119fcce31477d9017406a14fdced6832b7464f0b684e340c21b9402653641aaf3112c7956366106d86c881ff25ebc0b4af1fb7161759a WHIRLPOOL 96d43d3b53a35088d8c162573ddc1db6368371fbe932b43954604e8b1343d13f5a3ca61ca75ab9be44af814e68fcb0eb921dfee34e4f11fb3f947675c5177739
 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
@@ -41,22 +42,23 @@ EBUILD ccpn-2.2.2_p130618.ebuild 4649 SHA256 b207878c8186f25add8b44b09e0565c0659
 EBUILD ccpn-2.2.2_p130705.ebuild 4649 SHA256 1b3a3af9673c488457fc4b62074178c04c6aa67ef7db4bf1be13c628e8103a06 SHA512 e763f62dc24f181831ca87e301b889e2308a2d3ab34aea5934978cf509a3bc8387c68055d4f18ddc4cebb3d149e0ff0d3650d3dd80d616b551906a5568fdf405 WHIRLPOOL 3d41deb0023bdda918f3745c10f107d787388c88b68e98ee224fcb840029700b01405b2d3185a24c87f695b9dac071c9894376b053cbf961cd3db28190e9a171
 EBUILD ccpn-2.3.1.ebuild 4709 SHA256 ee3050fc0fd62efdbb32fc84e89cd11bed3570f3021909490d1080f76fc260fe SHA512 a03d3c1a8f517b9be2e093872288e0a8a14a93b5131b3b1de7a2d20f3e9569c5d0887e268b8b6a182195b7f595e2ab05e4f77716351e4ef8d8375af325e71bd3 WHIRLPOOL 4f810a4c972bc77a08b18d816606844f5f58556dfda2045907b549165a0638f99b55281677d958e19c8e84d87a75f46e7df55998427e706d1fba9f71a6b95f94
 EBUILD ccpn-2.3.1_p130813.ebuild 4716 SHA256 ff440c877003610b978bdecedd9a32a57eb2e5e54ed67a5868c3d0295978755b SHA512 a3661b1a67af7a912ed42482f3e5b6917eba5280f35fad5941e75882bec8c8b80c7d13ab243f2e46005f8683250ce66a31aaf9076e9bb653acf26883438e8aae WHIRLPOOL 84d89a81a13a373d566d078a12b68609117ceed2f89fd4a6ecf0c97c3d368e0a038971fe2675e1de05c6eace3490701e1160536de806bc6a0b590cf7022b86fe
-MISC ChangeLog 22182 SHA256 25430968253555b8a6e47046bca695da960ebe0a25e8d0b87da12090d88af70e SHA512 0944cfb882f958356e735956f8c0c1995dfab560a49cd43b2c8ba25e21f2463998c2c22f5b250f3aa7292004cc29d8e9001f823d3b3e122da1605e64d0ea0a75 WHIRLPOOL d0c3d351256615a59002f5ec6d0e9a46df81c7f4767f3f0486b00947ec38d74fcde60c44aa3fed5f93cdd282283fe96b15f4a51a32c81dadd9de5111698df909
+EBUILD ccpn-2.3.1_p130814.ebuild 4716 SHA256 31d9cdcfdf1c00a5c7dea719ec8de5585cf9d5899fd09debfb2bbaa310ca56d8 SHA512 dd6f4e26e049938f9ffb393e33ceea23f30c4d371f1bf71aec05b05faf387631c7dd7a8efe8aa4f64321a8c30cefd30cce3bc3408d6f19a56515537b640a44b2 WHIRLPOOL 1566c78e6d4171ecb7fc6935531aed1bda6b2a7d576cc140cab0b6053cb914b5ff8544b8bd2d18a3f37e2ec1f7f83fc4997fbda228e3af6aadeffe7941d52c1d
+MISC ChangeLog 22317 SHA256 5f03e6604b5ec0552e9e2d55604f726eeeac519d255c859dc0a9a4bdffdfff7e SHA512 328db46d6a1b3fc54d0a94dfd614d9252ecc84af73dbbde0cc6454a20360bede8012b6fbcee58e589647876c094f9d924d2a446899f96df89b8070c29049028f WHIRLPOOL 75f3d9fbe3271b39e2cc16c59b9539ee2cad14885605fa02bf49ff7edd550cbe9e316d385139de5fc295585aff884880fe3f6054fd31f65ac231e943ead0b820
 MISC metadata.xml 234 SHA256 8297e76ecd2cb828f604e9f138b263179eb84beb640215a0f60d7613eb46bb7f SHA512 0e94c0e6570a9267a39968d81c3b80680ccbc6eebb62199e4830b021a114c94a0de17ef2103cef62b7e27da1f51f225a30abb802aff82140ae6dc43366113d31 WHIRLPOOL fa6d4d90b092953b88ed3ad03e1e8c189296d268b39d13a4b4dcb78f0c4456341e3f1b44eea0860054fee43079179cb7cf7a912acf1fbe693ecdca6d9a65f081
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSCgoVAAoJELnU8jG9FVirgS0P/3TNuWh7XV6aNtwRV7Jt6PMR
-9FdqiVe4HrnSpIHM7mlnbkuP+P6946LIoUfwxnsYMpr67WUnGm1+ZCGUPpfHhncj
-tnNvj+Igr0DzGyl4w031T5N/MqPoSY/QlBLqjV86EPhNI0xCVs9Xqla1lzMwUssg
-bjkpkdTrm6PsW57PYbfeWXa6lfVRAZRTXjErSs2MXFSXsk0VAlVzNi9wrwkEsDzm
-iMKbTgq2IsGUn5l1xH7pLjgFacubyqATTJ60C3pIhKGYUhEQLSPAGxZSEgXDNj0j
-Oe/mVvbpgmaqhXSn8wZk+jYxaApiAtCUKpqDQApbVkzrDoruhP+DAKdsflEQ53R2
-DzjTrJ7/wn/aF13F3kAtHsXtzUpQY3icLE/FG58xn0pxT+fZYGQnNx8g7bOdFLWv
-fu5G1R2JP7FAV6hy3k2qVdh1NfxvcExTmo43bqnXOakHFRzAg6RCKOwXm8Tj66d6
-bwcecehIXzRbqWUii2XUJGz7i0vnFgA3d5AwL3NLYa9mlVZNsaXK6JPD8aqpArzh
-fIW0AQz6T/Wvfsqj/AH2GMIuUg6wRKV6v72hevC9xEik2V6v0i5e84jcvr4UBqqS
-mzTQp02lzw0QRspYXqvykaTvwaNAMSCU6ruTKMGVi7gxJYjJBOBl9azcM/46ilfc
-dcr3HZlFBA4SIfsPxdDJ
-=5DkG
+iQIcBAEBCgAGBQJSCzXdAAoJELnU8jG9FVirTo0P/1aQ2LO1ZtbAEFTZQ4HQfirX
+gOdh+oXiW98HpwQFikJwBoFonfGUdLUPsj6HJtmtIzwUFnEefaLrPmwdUwRtqdPb
+AdmJ1eIhabtXJfWqaSemG3dG00pHWtlo1K2u73R9KmlPxKxgSfO9MWMXeQX3ntKP
+NakfnvNQvLyWo9h9NxhJKKLbJgbio53ipQ015h0rCuCUP8G07u6XORKKncW4QFtP
+eRh7d4G5TVTfEwE8TVn0zxeXXabS2PqkTXKQC5bdTAp33m4iONllxpgUADJ/g3oO
+X+nbYGUTyWcYicetQ7YhroWD71FZpI3fjIgj7GzgHS017HWRP/SUw4DCGy/DbEHC
+LNwERitfjc8+DisKrQLvT/+BeLuUZ3WqdUENreJeogKO2MWlX/EGm9eF0euOO7wj
+Dvs1HFoXLe/duNnNKmFRyCyCu9nrRTQMi1EFwgsKwaGbNr8z47Uiv8w78f3gW+Vp
+FmmNVyAKFQgEdtkHWtKkr/y7Ri5Mcj9TK+nMtzCEDReaX6iRqaSyiS8olmMSpAXK
+wi59wQm3r1Kl335M4mZuShIyL+ht1AtG1bovU6SxeXfhHdZke5yMZD8xs0XQnWuM
+JsfuRHTFAKLLskIkmnJl6aj5bfoCkFnkNucXIk+DUv49VR6ucXt3sC2tS18mrW32
+1np1elxpDoLu6CMvCWAG
+=UmVX
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.3.1_p130814.ebuild b/sci-chemistry/ccpn/ccpn-2.3.1_p130814.ebuild
new file mode 100644
index 000000000000..966df06c1a90
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.3.1_p130814.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_p130814.ebuild,v 1.1 2013/08/14 07:46:36 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,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 -> analysis${MY_PV}.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
+
+	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
+}