From 193d114ca1c1c680d3e1a77ee65bb77109142461 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Thu, 18 Mar 2010 08:01:55 +0000 Subject: Todays Python patches Package-Manager: portage-2.2_rc67/cvs/Linux i686 --- sci-chemistry/ccpn/ChangeLog | 8 +- sci-chemistry/ccpn/Manifest | 10 +- sci-chemistry/ccpn/ccpn-2.1.3.1_p100318.ebuild | 181 +++++++++++++++++++++++++ 3 files changed, 194 insertions(+), 5 deletions(-) create mode 100644 sci-chemistry/ccpn/ccpn-2.1.3.1_p100318.ebuild (limited to 'sci-chemistry/ccpn') diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog index 6a1de7798547..65417bdbd3ee 100644 --- 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.17 2010/03/13 13:26:39 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.18 2010/03/18 08:01:55 jlec Exp $ + +*ccpn-2.1.3.1_p100318 (18 Mar 2010) + + 18 Mar 2010; Justin Lecher (jlec) + +ccpn-2.1.3.1_p100318.ebuild: + Todays Python patches *ccpn-2.1.3.1_p100313 (13 Mar 2010) diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest index 41fe4a956272..dc472f81dc7d 100644 --- a/sci-chemistry/ccpn/Manifest +++ b/sci-chemistry/ccpn/Manifest @@ -20,19 +20,21 @@ DIST ccpn-update-100308.patch.bz2 30914 RMD160 5540c49a7e362f464dcc774431234490b DIST ccpn-update-100311.patch.bz2 36925 RMD160 14e56026fa309b4011276dd07eee4c1292432ded SHA1 c505d95ffbb7af15fc906a2de14c572850e4ec00 SHA256 f0c3a1c48787097463491024ce31b410b984c2fd968371244e5f66d1c37f5c31 DIST ccpn-update-100312.patch.bz2 37664 RMD160 ea0acb9ce906c1d3cd5578f35e514fb3cfa99ff6 SHA1 43a1cc93403744281a2d65c7d2e0c62ba4bf8df8 SHA256 4b9402cb46bfd23c2d832a9434d8fa597de1e82863d1516b4ee086aecac6a917 DIST ccpn-update-100313.patch.bz2 39565 RMD160 115db3a3692cdf4f8b350eb024b22bc393d1855d SHA1 eb5fdde9b10eb1809732d2ef89c5c0aa08285cdd SHA256 79e15dcf5c7bc275fafea2edaa9abb62bbb2bf23b5210aef64a0601847ce0a75 +DIST ccpn-update-100318.patch.bz2 46578 RMD160 bcb3d5a11a2c856686fe38728e171d6e1ef00344 SHA1 a0ce3668a0022a74a0d70d1bb85fa59cd902a948 SHA256 5639a25dec37fc2bb44b68446f8c23a26ac2bdd81c103f05f893dccb2599c7fc 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 EBUILD ccpn-2.1.3.1_p100311.ebuild 4968 RMD160 4c28a74b04553b04bc23bc42061f6d90e260706d SHA1 9c660041c87d58046f0e464e1eb5621903cae0c1 SHA256 ef119ae533ec22f55dd2a7cd440a47829715833b792f217ec665358580912761 EBUILD ccpn-2.1.3.1_p100312.ebuild 4968 RMD160 06dc5d340a5a6cbbc16fe796b293de1117b1f96e SHA1 ea99f4e1433ca2b007ae805d2c5ff22ca677fd3e SHA256 b78534f7ed6830d83c0f4d01d3fb3744fdb8c314f4fc3625bbe02471c69da964 EBUILD ccpn-2.1.3.1_p100313.ebuild 4968 RMD160 d30df1e9625a939f7e1f87e37147ce669aa09c84 SHA1 2097a6b3c9a918e950c01a01c0ca42a90b7eb689 SHA256 119278b8f15da0af19b794c5b6ac06e49e2ff4e58e0a40831b47f94061ba6a25 +EBUILD ccpn-2.1.3.1_p100318.ebuild 4968 RMD160 fa68d224867dbf6449dbc00ad4f20fb8506570f8 SHA1 f022717dfbac4572490c38e28c9eeb5c480b9e41 SHA256 6385f414e90d3b79c565c8f650c123c123bd9c91b8dd00dc0b1061a985758fd2 EBUILD ccpn-2.1.3.ebuild 4975 RMD160 99530170d2323e58cd105a5a8e47c493d0fd765c SHA1 5c298bffe292915768357e8273a1fb3d05312fb3 SHA256 1f9701c42f9e9754f0d8dcb258e3e365ec31f4e8d99b5649376083b7ff87bbb9 -MISC ChangeLog 3147 RMD160 ddec2706d5c982ff79d6ac2c5a6cf22493569b54 SHA1 0afafc0de15bd3b7fa8437dff7d0b6a6bd2bed76 SHA256 644b8c5d0adceb42aa56a830ca59425b99633140be24db742c9a10f2eff308f5 +MISC ChangeLog 3298 RMD160 4fda6406677a5e6eccbcccdb5f7c1b678ad524f6 SHA1 1931726e096bc1e14489aea4be386a6d5d6b51a2 SHA256 5976d9f5ae0f3badf365c46709a6c98ae492bd80e7156c288bdcc06a9c5529fa MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkubkpUACgkQgAnW8HDreRZGTQCgw8lpB1Jd87twSoehsBq0f4vK -tKgAoM0D2cHg6u6H47OgslbMZK5woK+n -=YL2X +iEYEARECAAYFAkuh3eMACgkQgAnW8HDreRa+MQCfZfwxY87xD3aHdeEYKJHCyuPc +rV8AoKu7n0FvA4rX8Wu2dFAtJlg2r5Un +=GE+Z -----END PGP SIGNATURE----- diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100318.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100318.ebuild new file mode 100644 index 000000000000..18b95ee4c58b --- /dev/null +++ b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100318.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_p100318.ebuild,v 1.1 2010/03/18 08:01:55 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} +} -- cgit v1.2.3-65-gdbad