From: Justin Lecher Date: Wed, 3 Mar 2010 21:51:12 +0000 (+0000) Subject: Added todays python patches X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=58c6f33ab86169462d9d23564f48968d95d47c17;p=gentoo.git Added todays python patches Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog index ee7beb374e4c..d59d7dd9fdea 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.12 2010/02/27 09:39:12 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.13 2010/03/03 21:51:12 jlec Exp $ + +*ccpn-2.1.3.1_p100303 (03 Mar 2010) + + 03 Mar 2010; Justin Lecher (jlec) + +ccpn-2.1.3.1_p100303.ebuild: + Added todays python patches *ccpn-2.1.3.1_p100227 (27 Feb 2010) diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest index 7ec0e1896ac9..797ee6a33c40 100644 --- a/sci-chemistry/ccpn/Manifest +++ b/sci-chemistry/ccpn/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX 2.1.2_1-parallel.patch 490 RMD160 73b6c601950c9c83f8f3d3dd204db23ab9a60567 SHA1 676774362a3b5a2ecd2083cac09d3f73b38aeab0 SHA256 60f1b33d80545b97e32f8cbd5c01cd67824b9d3adf12cf2adceb197850d01d24 AUX 2.1.3-dynamics.patch 1271 RMD160 3ce267fbe9b2f68bc9ae6936b74ba74b5976c966 SHA1 8a0a7b0c669ffc8b42982d97ecce22f537e4850f SHA256 f3bcc43c6334d89abf054d6031e74bd3e14b1e421d712ea68e10bee1cd77b27b AUX 2.1.3-parallel.patch 1158 RMD160 b9135a8f529374310e9a521fc1ac3c5bb96d3443 SHA1 fc94deb1d4978493abaef33178888f7d2d12076f SHA256 a7e5a741a98236d753fe32a28cd341583c9f9c08997bcf4924f4ff7f033e0f6a @@ -15,10 +18,19 @@ DIST analysis2.1.3_1.tar.gz 18932918 RMD160 5f19ea6fe47c2910d16fcba8d1a78f0e1dea DIST ccpn-update-100216.patch.bz2 37914 RMD160 92d2845f9a21a5ddc9fd71cf56928b61f497530c SHA1 de61701435675d10165826cf4cd590dca336cbb2 SHA256 13e062188e953ea62e779b7d89004ce103db61daf228cf6b9f7d3c77f39947fc DIST ccpn-update-100226.patch.bz2 10123 RMD160 09a1fbe8cb6c75e8e9c0b005de299b676133a29e SHA1 a6db57e094c334f06e3f8d155b628543259d61dd SHA256 8db4adda421a0fb2a0d94985bb8379321291b80a0d448f9b764590b7ff825f85 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 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.ebuild 4975 RMD160 99530170d2323e58cd105a5a8e47c493d0fd765c SHA1 5c298bffe292915768357e8273a1fb3d05312fb3 SHA256 1f9701c42f9e9754f0d8dcb258e3e365ec31f4e8d99b5649376083b7ff87bbb9 -MISC ChangeLog 2280 RMD160 27989aea0de54eb44c178066aa4f6cad59d3114e SHA1 9461f35eae589a03f4eca3fe5491bcbd560f32c4 SHA256 21634f27bdcedf70b5043638509ef07e8e41ec052c2d8821f92a890d600fba33 +MISC ChangeLog 2434 RMD160 78f16fd903c1abc5ea6f4c515f470e3913de84d8 SHA1 5643f542c90191ef98aaccef304a5f14b662b2e7 SHA256 a998c3610757f3ab96463b35922e60ea2e79b6503908d289e9e73cf2dd38374d MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkuO2dwACgkQgAnW8HDreRZseQCghAN80HvrpLZTz6R4ZqZvP2A4 +IoIAoIG5LF7jqPMJyXCKtKVgRhi82yVo +=Y7wG +-----END PGP SIGNATURE----- diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100303.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100303.ebuild new file mode 100644 index 000000000000..867ddfa4e360 --- /dev/null +++ b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100303.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_p100303.ebuild,v 1.1 2010/03/03 21:51:12 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} +}