Todays Python patches

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index b26014a4ea11dde0eb39830aa300499f89bc7d39..e01968e756693c2eeb7644636f3ed94ccb21a510 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.20 2010/03/26 11:20:20 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.21 2010/03/27 08:04:22 jlec Exp $
+
+*ccpn-2.1.3.1_p100327 (27 Mar 2010)
+
+  27 Mar 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +ccpn-2.1.3.1_p100327.ebuild:
+  Todays Python patches
 
 *ccpn-2.1.3.1_p100326 (26 Mar 2010)
 

diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index a35f4a2a5a0c7e6885d95f8c3203161f2d70cde9..c457ea6ebbc3e2523fb5d2b8a988a0a0c03ddf22 100644 (file)
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -22,6 +22,7 @@ DIST ccpn-update-100312.patch.bz2 37664 RMD160 ea0acb9ce906c1d3cd5578f35e514fb3c
 DIST ccpn-update-100313.patch.bz2 39565 RMD160 115db3a3692cdf4f8b350eb024b22bc393d1855d SHA1 eb5fdde9b10eb1809732d2ef89c5c0aa08285cdd SHA256 79e15dcf5c7bc275fafea2edaa9abb62bbb2bf23b5210aef64a0601847ce0a75
 DIST ccpn-update-100318.patch.bz2 48906 RMD160 41a17709c807e4ae1a7a5145c2dca9ba09a80f4d SHA1 b99002dfd2fc9eb85a4c88f580aa8f1675fb8063 SHA256 dffcb3617238d10bc373be9a91afe8f8d77879d26e40d09a52b052472c20b735
 DIST ccpn-update-100326.patch.bz2 80654 RMD160 b42fe6eef14d8384e78a091f2fce6c53c910a410 SHA1 27f723753850b2f3d2bf3ae11aa5db3bda1294b4 SHA256 069c3ec93b7affafc8334e42fbd5f0b1f1a4bb916f7dad6fc3f4faa6e12d7c7d
+DIST ccpn-update-100327.patch.bz2 81747 RMD160 ca6f704988f89caff0efaa69feac1c4e49c37c7a SHA1 52efe36493da8792addfa84375d96dae0d368ab2 SHA256 b4e3b80c2e29ea7d28b695ab5650de5f3098a2cf01faf3fa9caea57e52de9f74
 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_p100308.ebuild 4968 RMD160 55570e8d965a301270dfbbeb525127c06a2fb13d SHA1 2e33e0da5337ff7fe2fcaf5f6c0cc0f0471714b9 SHA256 59fdc2733014cc89eaed8b3fe3692bfa1153d4697216b558c961ca6906a1f448
@@ -31,13 +32,14 @@ EBUILD ccpn-2.1.3.1_p100313.ebuild 4968 RMD160 d30df1e9625a939f7e1f87e37147ce669
 EBUILD ccpn-2.1.3.1_p100318-r1.ebuild 4971 RMD160 0c2b6a132a9cb49b27c40130c60aa4c2db98c4e6 SHA1 28777121022e98378462468c31198f110555d059 SHA256 6cfe73319d9aa1758947df1f939136b9fa583cb35102d00ff017229076f9154e
 EBUILD ccpn-2.1.3.1_p100318.ebuild 4968 RMD160 fa68d224867dbf6449dbc00ad4f20fb8506570f8 SHA1 f022717dfbac4572490c38e28c9eeb5c480b9e41 SHA256 6385f414e90d3b79c565c8f650c123c123bd9c91b8dd00dc0b1061a985758fd2
 EBUILD ccpn-2.1.3.1_p100326.ebuild 4968 RMD160 2eee20a6e09949096b82d7ebe2844e7d75a358b5 SHA1 c5e3fb5539942e5f9cf9fa778e71f9085f89e545 SHA256 48827cac002bb1089db5b90930d54301a2fb6588460923583d0f08f4b8603a55
+EBUILD ccpn-2.1.3.1_p100327.ebuild 4968 RMD160 53bf882645e2d43f36eaa1b3ac1cc92c925693d4 SHA1 558e2ad76c2532ca829acceb024000a326dd1f37 SHA256 8ad862f5854757144ced77da479b15b67ff826a83082362219a1a288ce6bb3c9
 EBUILD ccpn-2.1.3.ebuild 4975 RMD160 99530170d2323e58cd105a5a8e47c493d0fd765c SHA1 5c298bffe292915768357e8273a1fb3d05312fb3 SHA256 1f9701c42f9e9754f0d8dcb258e3e365ec31f4e8d99b5649376083b7ff87bbb9
-MISC ChangeLog 3591 RMD160 f7b1b1974b3edb663877f6b8c3c2974ac85ffd59 SHA1 ee94bd9940643ddf5f8834395e1d677520cb7f76 SHA256 d84a8eef7dd747cdc3c1d8a40fb9618d16d71b41a680dfa0d50d35f1eae677f7
+MISC ChangeLog 3739 RMD160 9bf7c0fcce723ba3964d787ef5ae58b47ce5a80d SHA1 ba4f0e03b8630de96b8e6a4b1e9fb52349cee0f8 SHA256 752a8ab635a7bb8cbfe0abb7a9be955ec678833bf653cce7f7889edd1ff42949
 MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkusmHoACgkQgAnW8HDreRYvTwCeOlRAexG7cpIZfzkQeAdfrvos
-OMYAnjifyFsvmBgDVCfioF4Yc5GWd7AR
-=Mni+
+iEYEARECAAYFAkutvAwACgkQgAnW8HDreRZM3wCguPlNqCqjawGr3JvVqM7MJfy4
+a5UAn0RAzrkPQKy8JlSyR/VK79WmrCk7
+=M2l5
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100327.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100327.ebuild
new file mode 100644 (file)
index 0000000..5b5f6e4
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100327.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_p100327.ebuild,v 1.1 2010/03/27 08:04:22 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}
+}