Python changes added

Package-Manager: portage-2.2_rc66/cvs/Linux i686

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 9bcfd908d7845c615cea438cf9d20b2e0d791699..0cdbc0b2275c60c49e3c6491b0f32f3d6380b6d6 100644 (file)
--- 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.14 2010/03/08 21:20:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.15 2010/03/11 08:17:02 jlec Exp $
+
+*ccpn-2.1.3.1_p100311 (11 Mar 2010)
+
+  11 Mar 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
+  +ccpn-2.1.3.1_p100311.ebuild:
+  Python changes added
 
 *ccpn-2.1.3.1_p100308 (08 Mar 2010)
 

diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index 12682bebe0ac4ded51d89659219f812ec94eb57c..ab650bb2d73676bc437f42dc923b52b99c67b3d0 100644 (file)
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -20,19 +20,21 @@ DIST ccpn-update-100226.patch.bz2 10123 RMD160 09a1fbe8cb6c75e8e9c0b005de299b676
 DIST ccpn-update-100227.patch.bz2 10754 RMD160 bf822c074655c8b0e6f2cb92ebeb592cf1491a4d SHA1 fa704d5cae4aab72bdf08b6e75a576f01a368ec3 SHA256 411f131672f32cb7e0135eb2327043cebe7bf7329b107f3b0c70c0a20a45fa13
 DIST ccpn-update-100303.patch.bz2 14205 RMD160 d704c5582afa4ed9e68983462944bd1177b7a59f SHA1 73993e6e94dce14c6c245ef12c53179318dbecd0 SHA256 f68ba47e09b5d14e8dbb6aec46f8789d5038f6aa4151a9b8d5fef06207be6af6
 DIST ccpn-update-100308.patch.bz2 30914 RMD160 5540c49a7e362f464dcc774431234490b6d7082b SHA1 ff72c1ace15c192779c2e59e27fca6944d696429 SHA256 25d9ee427f909cad0f19233963f19494649ed9c761005175d447bc4cd5e6907c
+DIST ccpn-update-100311.patch.bz2 36925 RMD160 14e56026fa309b4011276dd07eee4c1292432ded SHA1 c505d95ffbb7af15fc906a2de14c572850e4ec00 SHA256 f0c3a1c48787097463491024ce31b410b984c2fd968371244e5f66d1c37f5c31
 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_p100226-r1.ebuild 4987 RMD160 42c22f2a59502dceb18a32f5048699223bbbcc5d SHA1 f307c4c681d7118da50a08b70e34be1b300ec61a SHA256 f17620d06aa3b3d246852e6a17768feb897118199d6e1d8d47bb10617ae60ec6
 EBUILD ccpn-2.1.3.1_p100227.ebuild 4984 RMD160 381de136fafe9bcfdee6b8500dd1c465b1ddde2e SHA1 a9cb9540ebe8593cfcf57ca3ff7ad22df0120cb2 SHA256 b835bee95075191931436e486f0431cec2c7b53a2503fd3477900b52a4e47763
 EBUILD ccpn-2.1.3.1_p100303.ebuild 4968 RMD160 703861d3da368b696576cce61e99499f4dd9a387 SHA1 cb6780945522c5dc44930bfcefa093921e49787c SHA256 3449904be5a5e91a9b33162de7fdc62a392a612696b069ec1cb92163925ce4c6
 EBUILD ccpn-2.1.3.1_p100308.ebuild 4968 RMD160 55570e8d965a301270dfbbeb525127c06a2fb13d SHA1 2e33e0da5337ff7fe2fcaf5f6c0cc0f0471714b9 SHA256 59fdc2733014cc89eaed8b3fe3692bfa1153d4697216b558c961ca6906a1f448
+EBUILD ccpn-2.1.3.1_p100311.ebuild 4968 RMD160 4c28a74b04553b04bc23bc42061f6d90e260706d SHA1 9c660041c87d58046f0e464e1eb5621903cae0c1 SHA256 ef119ae533ec22f55dd2a7cd440a47829715833b792f217ec665358580912761
 EBUILD ccpn-2.1.3.ebuild 4975 RMD160 99530170d2323e58cd105a5a8e47c493d0fd765c SHA1 5c298bffe292915768357e8273a1fb3d05312fb3 SHA256 1f9701c42f9e9754f0d8dcb258e3e365ec31f4e8d99b5649376083b7ff87bbb9
-MISC ChangeLog 2582 RMD160 01f7d5503c10e2dfbac6083ad19371015e04503f SHA1 8822cac1952c1b2fab9d01405ecffcb6dcb1a1bc SHA256 6d77f119110752a0e6ff626781de76c532f3a3e95372801b9dfc174bec5eceb3
+MISC ChangeLog 2732 RMD160 ad1654d5d0b7bb576262f8694199758695522f24 SHA1 8adab319c3f6158be5258de99a988091a2d7a7c4 SHA256 85431ba57dda20dc1321490f33138ea861cc98665d30883e3b9ef5712508edc5
 MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuVajAACgkQgAnW8HDreRbyFQCfcD4C84iQETzsvebBYdvmpo/I
-okAAoIQ+Q1eV/QBSuDIeI3YQ7W6c50ZB
-=B+iF
+iEYEARECAAYFAkuYpvMACgkQgAnW8HDreRY8BgCgmpIhk+hvMsM1YwshnN793O4r
+51IAnAhOEMnrLIzg4Nh3Q5mMyaHYQqpc
+=pkyc
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100311.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100311.ebuild
new file mode 100644 (file)
index 0000000..9978723
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100311.ebuild
@@ -0,0 +1,181 @@
+# 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_p100311.ebuild,v 1.1 2010/03/11 08:17:02 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
+       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:^\(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" \
+                       -e "s:^\(GL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):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}
+}