sci-chemistry/ccpn: Todays python patches, drop USE=extendnmr

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x70EB7916

3 files changed, 186 insertions, 6 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index c039747cab83..7f52a849ce96 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.98 2012/11/19 09:47:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.99 2012/11/25 09:16:31 jlec Exp $
+
+*ccpn-2.2.2_p121125 (25 Nov 2012)
+
+  25 Nov 2012; Justin Lecher <jlec@gentoo.org> +ccpn-2.2.2_p121125.ebuild:
+  Todays python patches, drop USE=extendnmr
 
 *ccpn-2.2.2_p121119 (19 Nov 2012)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index 7a4ddba67583..ae3f9dbae50f 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 2.1.3_1-dynamics.patch 825 SHA256 53577b6f9621a707b1b5d676d57ed16f3963f3172598d944b823133908226edb SHA512 56d89056a2916cf7c5a90084b151a46a39a456ad84c1d9d4042bfa1bd236b576e3f3232a2e34c0adbeff77a4f954d73b1565e0df701a29a0eca1e0a654728e74 WHIRLPOOL 084bdee6ca240491db0a718e23529887c3b4341217a036be4f87e3172cdb01db364ff4adc6a63d66aa146c605e05891d2d1c879cf0576084c5662e016314b74e
 AUX 2.1.3_1-impl-dec.patch 2818 SHA256 f175a1b4a9cc4f1636bf36928883d37a266af830234aa3d7676f4fe4f7f1ddd8 SHA512 11d54abe5578424c601f97e28f7af613284b789ad977c6b1f4e737116828ad0eee3183f65ba20e609065d602028a3cc59ebd6fe232d0c06133b0dcaea5f3dbea WHIRLPOOL 597d03fab86dcd61991a256a06644df0edb3edbbcbc6b916b8b3dd6808f5809a473383facabd46bf1ac343a9d75f9c49cac36c1a1a8cc60974f66b43237634fe
@@ -23,18 +23,20 @@ DIST ccpn-update-2.2.2-120912.patch.xz 48644 SHA256 96d0287900a586439b49cc8f7638
 DIST ccpn-update-2.2.2-121012.patch.xz 155460 SHA256 7a5441049fe0f002ee84cfce853043b350ade73c0c564901964db59ec13bb5fe SHA512 86d8bd03cde0a81542cde451c9ab759971c9ea30a1ada0e2961370640d1c139fa8e050e102969d7dd59c2d4664c87da6ccaae1af803a48c0d2ff6c52fb49d295 WHIRLPOOL 7acaeeee4eda9f6d16b630c898244683d40e1809bb0457ce68f26e1ac8c8b691ef227dc873b9f60e53b6c077d2b602f682a782121aa5c9f004e35d9460181016
 DIST ccpn-update-2.2.2-121112.patch.xz 223036 SHA256 a46fd5927ff2c2e1be88d1a9ecce520a6cd551efaf98fe1c4e2b8c3d51a40a27 SHA512 68bb7b715ec76f0b83c2bcf436b6a88c2e5f554a245b509bd387926df16c5249c1fdf315a987b6e55c4a00d02382afb1c99a350907829811390d0a50e8d672df WHIRLPOOL b7863197439a917b49914a5ea7997963c1d14ca74baf77523676b653300d3d08e5eb5bbfc5abc4d05e71c94f8bb30e8446776623085aa8a7b279f1107277bd05
 DIST ccpn-update-2.2.2-121119.patch.xz 223500 SHA256 9c419940b6c86347ad1d1cbe3f04c03e0331c79b9eca5c79acd972cf5e72d7d3 SHA512 24802c38f18d9ffe88d67212cfcee7b07312b7758d761b90ff1cf50a093926bfbf50b27f4a5b2bf85c9b5650fd9aa0ce29b621fe71b4c92327ba5d0ddd94289a WHIRLPOOL f43b19c2fcc61ae58a56b4e9465743068815da37c5469487364112e53c3ab64ac3319f180f06433cd53b1ebc4040e50a562168a3e5b87e68785fa42f9962efb2
+DIST ccpn-update-2.2.2-121125.patch.xz 223556 SHA256 996f453d7d6a143715a94b1201bd7b8b9c037f6d0baa342f5c0645d500aa5c79 SHA512 d213e072a63110ec478c3ee64792b01c818d3c9052ae6d7dac903508536f78c432c72d5a4756665045579d72f4f54ef5ac9db1fb02eb5ea3111eaa47e72866b0 WHIRLPOOL c268761e4d9cf4c845964c7c865e20439a9cacd00bc56d89d8558e0f601fc9840d4288307c4a4f47ba6d478eb9da9dacd1e149c657d2e6506ef5e32d6b0b75d1
 EBUILD ccpn-2.1.3.1_p100806.ebuild 5181 SHA256 c3ba268461da63ea23ee7f621a8e4837a368eb3e4c85bcc5245250fb6b377b58 SHA512 701ea90a13dc44e5bf1ea17c0f69adea56b1c14788ab79c67fa4b9726cae532998717515568045aec9bb4e1dd4c352227130115d90c50bf07e7fd132cdee385d WHIRLPOOL 898a618f95b254785739e6fab20af333cb3a44bff12cd6840d1b111f1588a60e48055e8af7ca88457173452f6acba86ebd3bada96390211bc4cd063fe4160fd5
 EBUILD ccpn-2.2.2_p120829.ebuild 4799 SHA256 6930082cd40aad6f0503c4e02e21b377f4e3411264007a5b72b77ad107616843 SHA512 4b1e894a6650fa0ecbd9c6acc8811fd9317cffb1eebe40e8364394bd8d979c55956fafd1c67a8bc2349bd1b78b8dd3f3539f112b8de29cb6bcebdfe13887a699 WHIRLPOOL dae24e4ba14c8846c8413236b88261ecc2cd3ab00dae680bc5cc8cee6a1f1333a7bb40cdc069c9a2bf1687dca284f8a68e66aef58e237be5fdb86328f2dd0125
 EBUILD ccpn-2.2.2_p120912.ebuild 4799 SHA256 e2d429881107e93973f2dd87982cbf2aff65bfc4d7def242931854f4d8199a74 SHA512 dc0e6b64d01164a68896701a9f9880206dccf067752865bfbd01afb6f5ceb3cb2603f41b96f275a65a6249f31af1306bcba77890cb773e15c6cb0000a967ce69 WHIRLPOOL fab86d5cc8e204ede0d3af451d736bce90fbfb52ce384ceb6c925fc97f41938590ea2b82f260ea3a07d6636b4e507528b9fa4de0a2ff9fdbefac763c42bf0f9e
 EBUILD ccpn-2.2.2_p121012.ebuild 4799 SHA256 8d50143deb47c2fe91a82d373f5d9f17ce16f12aa5ba1fa9ad616cfee2510a52 SHA512 865d37b28ec93eabf7cac2a9f61bd3561bec3df194b1f87850477891853f17f1dfeec8c95cbea3a2a8b8fea43d46b70d286583c2543c44f89c7c368123b1164f WHIRLPOOL dc8794af8523f643a333169bd3f349c44cc1ff001c71d61e75fca18394a16f279aef035aeb50ac0ce6de2f9f72bc2b2087c4c346524e95bbaa90552e2a5f6683
 EBUILD ccpn-2.2.2_p121112.ebuild 4799 SHA256 0260a618fb47fc405fabf7f981148a56a5dbdb1cf4890ac1d42001be6dc257b3 SHA512 f20ab472bda522f174c64986b75c09985a919ec6803e31465806f719a96ca303152859fd874c56019d2ded4228838f3d1eae8917219273d4ee186ef8d035e7ea WHIRLPOOL 368e614428d659d6e85b708fb085fb5eb529c710d6f8975439ffa2955e1a4588014379fec20821be4f65a09fb13d2391cd9ad05a75891ce6bf388a5e23cdd349
 EBUILD ccpn-2.2.2_p121119.ebuild 4799 SHA256 77f149b7f45de457685d6cc5b26eafcd963085286d6f5bd920959d8106f89090 SHA512 655d562b7e3e45fe4971b0c928b91c69ec954eff5634bb344716e68a8d97196f57316f91735969231c6b6279550345e6dfef9962e44e25a8c7da9253a25856ca WHIRLPOOL 211bf422c91cef62eef97e4ecfb5f75a03dfe83b428837c18766e2e059bfb0d68d816dd649e892d87e80bc536c90e0cc17672b2e93cfc46a5c226f60f795bad0
-MISC ChangeLog 19364 SHA256 e64da0a28226b74127899731b45ae1c106ff4c6f95a065a0ab54a0f644298cd4 SHA512 f638ecd52616f16c15d3e355ad7ed0887c5c5917ecdcc28ed62261c4f4882b067062ae1c6d8fa5af453006ae0b541c2e8d0169db090027903b5e2709e85a0c77 WHIRLPOOL dc2935a042c60f610b9fac9e2d7cf50aacac63f3986a73ff88adc5665dbc53c40ca1462e09b7e30c812efdacc17b586694f28fa7b73853f12251f0fbc7767635
+EBUILD ccpn-2.2.2_p121125.ebuild 4612 SHA256 08a4b0682c049a6301138ea6f24d665edb0a8d8d709ed2c2f2529aa0a5e648a1 SHA512 f8c45f0b19a721775dab3147cced933e8db969e8443c15cd2bd2a31ffc3fcd0eda95acc75a93df5d0dd51dabd80fde8311a7b02bf3f6a051bc0855cb156755a5 WHIRLPOOL 427cacc0c080197cc79a867f1cf1d5bed45cbfbb0f8c5dc6456548218895ff25023ea30090e751af78b77fffd47f87f7aac3869a8ed13aa3727f2f12bac743b1
+MISC ChangeLog 19519 SHA256 a3fa301ba3d5aeabc4e241ce7cf31bb44c6c08702702ea72a0ddd85f89d10a77 SHA512 5b03e4b73d1644cf28cae47e5c2211c94422c22c373bbabeb6b079a93a119cdbe342a46f605f29104b7141524f5c4672a323e52121cec40b6e40fd7fdd98dd10 WHIRLPOOL dea7670053096817e5ca1490c173f3ed0e117e06d2f398c6849ef491ad9c5a2cb6b24db17d95f2f4fde378d974e7663eb875db5966c9a133896da40f50452ce0
 MISC metadata.xml 322 SHA256 7468ba4c27b879e7ed5f82274f5837e51f1f389673a33b9e26e1756a6b0783df SHA512 01933ddaa7b2ab20fd0c07ba6725c162dc9e0512275c91ff657732a69135f1ca7cb3ce39002b4e386aedf27fca26c086f80d31bd8a0821b696c9b99f59c140a4 WHIRLPOOL 1bd202323ff47b3fb34ca4cc6c89567b69a480d38abbcf1a140cbf8f316ebad8b7f95b4525ac261174e1b94555644cdb791dc532398b8f2fbf3cce74283d8ef8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlCqACwACgkQgAnW8HDreRYzSQCg0I5VC8EVJVASTmFvLOCMzGUz
-52kAoK6Re+kk4viHXnKIhCQFFmpSgUEk
-=PHXO
+iEYEAREIAAYFAlCx4fYACgkQgAnW8HDreRZ8gQCfTFwrhu2dZb3l1UFtknt4tioF
+Yk0AoKYFf8oLZfcnts4F+E+Rs9eidiT9
+=qTu/
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.2.2_p121125.ebuild b/sci-chemistry/ccpn/ccpn-2.2.2_p121125.ebuild
new file mode 100644
index 000000000000..18be6d045989
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.2.2_p121125.ebuild
@@ -0,0 +1,173 @@
+# 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_p121125.ebuild,v 1.1 2012/11/25 09:16:31 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"
+HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
+SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/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"
+
+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 )"
+DEPEND="${RDEPEND}"
+
+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 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}
+}