From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PdTal-0007Ap-8p for garchives@archives.gentoo.org; Thu, 13 Jan 2011 20:16:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5D3AE08D3; Thu, 13 Jan 2011 20:16:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 98471E08AE for ; Thu, 13 Jan 2011 20:16:07 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D2C651B40C3 for ; Thu, 13 Jan 2011 20:16:06 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2264) id 7176120054; Thu, 13 Jan 2011 20:16:05 +0000 (UTC) From: "Justin Lecher (jlec)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, jlec@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sci-chemistry/ccpn: ccpn-2.1.5_p110113.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: ccpn-2.1.5_p110113.ebuild ChangeLog X-VCS-Directories: sci-chemistry/ccpn X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher Content-Type: text/plain; charset=utf8 Message-Id: <20110113201605.7176120054@flycatcher.gentoo.org> Date: Thu, 13 Jan 2011 20:16:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 2f293f37-d910-4ce7-8d6c-23d4a3309f29 X-Archives-Hash: cf1b2512cca154a5bdd7ff6f56cedbee jlec 11/01/13 20:16:05 Modified: ChangeLog Added: ccpn-2.1.5_p110113.ebuild Log: Python patches included from today =20 (Portage version: 2.2.0_alpha15/cvs/Linux x86_64) Revision Changes Path 1.50 sci-chemistry/ccpn/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn= /ChangeLog?rev=3D1.50&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn= /ChangeLog?rev=3D1.50&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn= /ChangeLog?r1=3D1.49&r2=3D1.50 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- ChangeLog 5 Jan 2011 19:02:25 -0000 1.49 +++ ChangeLog 13 Jan 2011 20:16:05 -0000 1.50 @@ -1,6 +1,11 @@ # ChangeLog for sci-chemistry/ccpn # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.49 2= 011/01/05 19:02:25 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.50 2= 011/01/13 20:16:05 jlec Exp $ + +*ccpn-2.1.5_p110113 (13 Jan 2011) + + 13 Jan 2011; Justin Lecher +ccpn-2.1.5_p110113.ebuil= d: + Python patches included from today =20 *ccpn-2.1.5_p110105 (05 Jan 2011) =20 1.1 sci-chemistry/ccpn/ccpn-2.1.5_p110113.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn= /ccpn-2.1.5_p110113.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn= /ccpn-2.1.5_p110113.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: ccpn-2.1.5_p110113.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110113.= ebuild,v 1.1 2011/01/13 20:16:05 jlec Exp $ EAPI=3D"3" PYTHON_DEPEND=3D"2:2.5" PYTHON_USE_WITH=3D"ssl tk" inherit eutils portability python toolchain-funcs versionator PATCHSET=3D"${PV##*_p}" MY_PN=3D"${PN}mr" MY_PV=3D"$(replace_version_separator 3 _ ${PV%%_p*})" MY_MAJOR=3D"$(get_version_component_range 1-3)" DESCRIPTION=3D"The Collaborative Computing Project for NMR" SRC_URI=3D"http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_P= V}.tar.gz" [[ -n ${PATCHSET} ]] && SRC_URI=3D"${SRC_URI} http://dev.gentoo.org/~jle= c/distfiles/ccpn-update-${PATCHSET}.patch.bz2" HOMEPAGE=3D"http://www.ccpn.ac.uk/ccpn" SLOT=3D"0" LICENSE=3D"|| ( CCPN LGPL-2.1 )" KEYWORDS=3D"~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE=3D"extendnmr +opengl" RDEPEND=3D" dev-lang/tk[threads] >=3Ddev-python/numpy-1.4 >=3Ddev-tcltk/tix-8.4.3 =3Dsci-libs/ccpn-data-"${MY_MAJOR}"* x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet )" # We need to fix this # sci-chemistry/mdd DEPEND=3D"${RDEPEND}" PDEPEND=3D" extendnmr? ( sci-chemistry/aria sci-chemistry/prodecomp )" RESTRICT=3D"mirror" S=3D"${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV}= ) pkg_setup() { python_set_active_version 2 } src_prepare() { [[ -n ${PATCHSET} ]] && \ epatch "${WORKDIR}"/ccpn-update-${PATCHSET}.patch epatch "${FILESDIR}"/${MY_PV}-parallel.patch local tk_ver local myconf tk_ver=3D"$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)" if use opengl; then GLUT_NEED_INIT=3D"-DNEED_GLUT_INIT" IGNORE_GL_FLAG=3D"" GL_FLAG=3D"-DUSE_GL_FALSE" GL_DIR=3D"${EPREFIX}/usr" GL_LIB=3D"-lglut -lGLU -lGL" GL_INCLUDE_FLAGS=3D"-I\$(GL_DIR)/include" GL_LIB_FLAGS=3D"-L\$(GL_DIR)/$(get_libdir)" else IGNORE_GL_FLAG=3D"-DIGNORE_GL" GL_FLAG=3D"-DUSE_GL_FALSE" fi GLUT_NOT_IN_GL=3D"" GLUT_FLAG=3D"\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)" rm -rf data model doc license || die sed \ -e "s:/usr:${EPREFIX}/usr:g" \ -e "s:^\(CC =3D\).*:\1 $(tc-getCC):g" \ -e "s:^\(OPT_FLAG =3D\).*:\1 ${CFLAGS}:g" \ -e "s:^\(LINK_FLAGS =3D.*\):\1 ${LDFLAGS}:g" \ -e "s:^\(IGNORE_GL_FLAG =3D\).*:\1 ${IGNORE_GL_FLAG}:g" \ -e "s:^\(GL_FLAG =3D\).*:\1 ${GL_FLAG}:g" \ -e "s:^\(GL_DIR =3D\).*:\1 ${GL_DIR}:g" \ -e "s:^\(GL_LIB =3D\).*:\1 ${GL_LIB}:g" \ -e "s:^\(GL_LIB_FLAGS =3D\).*:\1 ${GL_LIB_FLAGS}:g" \ -e "s:^\(GL_INCLUDE_FLAGS =3D\).*:\1 ${GL_INCLUDE_FLAGS}:g" \ -e "s:^\(GLUT_NEED_INIT =3D\).*:\1 ${GLUT_NEED_INIT}:g" \ -e "s:^\(GLUT_NOT_IN_GL =3D\).*:\1:g" \ -e "s:^\(X11_LIB_FLAGS =3D\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \ -e "s:^\(TCL_LIB_FLAGS =3D\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \ -e "s:^\(TK_LIB_FLAGS =3D\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \ -e "s:^\(PYTHON_INCLUDE_FLAGS =3D\).*:\1 -I$(python_get_includedir):g" = \ -e "s:^\(PYTHON_LIB =3D\).*:\1 $(python_get_library -l):g" \ c/environment_default.txt > c/environment.txt } src_compile() { emake -C c all links } src_install() { local libdir local tkver local _wrapper find . -name "*.pyc" -type d -delete libdir=3D$(get_libdir) tkver=3D$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2) _wrapper=3D"analysis dangle dataShifter depositionFileImporter eci forma= tConverter pipe2azara" use extendnmr && _wrapper=3D"${_wrapper} 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:${EPREFIX}/usr/bin/python:g" \ -e "s://:/:g" \ "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrappe= r}" dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}" done local in_path local files local pydocs pydocs=3D"$(find python -name doc -type d)" rm -rf ${pydocs} || die in_path=3D$(python_get_sitedir)/${PN} for i in python/memops/format/compatibility/{Converters,part2/Converters= 2}.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 || die "main files installation failed" eend dosym ../../../..//share/doc/ccpn-data-${MY_MAJOR}/html ${in_path}/doc = || die for i in ${pydocs}; do dosym /usr/share/doc/ccpn-data-${MY_MAJOR}/html/${i} ${in_path}/${i} done dosym /usr/share/ccpn/data ${in_path}/data dosym /usr/share/ccpn/model ${in_path}/model einfo "Adjusting permissions" files=3D" cambridge/c/BayesPeakSeparator.so ccp/c/StructUtil.so ccp/c/StructStructure.so ccp/c/StructBond.so ccp/c/StructAtom.so ccpnmr/c/DyAtomCoord.so ccpnmr/c/DyDistConstraint.so ccpnmr/c/DyDistForce.so ccpnmr/c/AtomCoordList.so ccpnmr/c/DyAtomCoordList.so ccpnmr/c/ContourStyle.so ccpnmr/c/ContourLevels.so ccpnmr/c/SliceFile.so ccpnmr/c/PeakCluster.so ccpnmr/c/Dynamics.so ccpnmr/c/Bacus.so ccpnmr/c/Midge.so ccpnmr/c/DyDistConstraintList.so ccpnmr/c/WinPeakList.so ccpnmr/c/PeakList.so ccpnmr/c/DistConstraint.so ccpnmr/c/CloudUtil.so ccpnmr/c/DistForce.so ccpnmr/c/DistConstraintList.so ccpnmr/c/AtomCoord.so ccpnmr/c/DyDynamics.so ccpnmr/c/ContourFile.so memops/c/ShapeFile.so memops/c/BlockFile.so memops/c/PdfHandler.so memops/c/MemCache.so memops/c/FitMethod.so memops/c/PsHandler.so memops/c/GlHandler.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 } pkg_postinst() { python_mod_optimize ${PN} } pkg_postrm() { python_mod_cleanup ${PN} }