* [gentoo-commits] gentoo-x86 commit in sci-chemistry/ccpn: ChangeLog ccpn-2.1.3.1_p100225.ebuild ccpn-2.1.3_p100225.ebuild
@ 2010-02-25 8:54 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2010-02-25 8:54 UTC (permalink / raw
To: gentoo-commits
jlec 10/02/25 08:54:44
Modified: ChangeLog
Added: ccpn-2.1.3.1_p100225.ebuild
Removed: ccpn-2.1.3_p100225.ebuild
Log:
Bumped wrong version
(Portage version: 2.2_rc63/cvs/Linux i686)
Revision Changes Path
1.9 sci-chemistry/ccpn/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/ChangeLog?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/ChangeLog?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/ChangeLog?r1=1.8&r2=1.9
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ChangeLog 25 Feb 2010 08:07:24 -0000 1.8
+++ ChangeLog 25 Feb 2010 08:54:43 -0000 1.9
@@ -1,11 +1,11 @@
# 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.8 2010/02/25 08:07:24 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.9 2010/02/25 08:54:43 jlec Exp $
-*ccpn-2.1.3_p100225 (25 Feb 2010)
+*ccpn-2.1.3.1_p100225 (25 Feb 2010)
25 Feb 2010; Justin Lecher (jlec) <jlec@j-schmitz.net>
- +ccpn-2.1.3_p100225.ebuild:
+ +ccpn-2.1.3.1_p100225.ebuild:
Today's python patches added
*ccpn-2.1.3.1 (18 Feb 2010)
1.1 sci-chemistry/ccpn/ccpn-2.1.3.1_p100225.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100225.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100225.ebuild?rev=1.1&content-type=text/plain
Index: ccpn-2.1.3.1_p100225.ebuild
===================================================================
# 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_p100225.ebuild,v 1.1 2010/02/25 08:54:43 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.gentooexperimental.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 --no-link
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}
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-02-25 8:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-25 8:54 [gentoo-commits] gentoo-x86 commit in sci-chemistry/ccpn: ChangeLog ccpn-2.1.3.1_p100225.ebuild ccpn-2.1.3_p100225.ebuild Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox