| 1 |
jlec 10/04/09 06:09:40 |
| 2 |
|
| 3 |
Modified: ChangeLog ccpn-2.1.3.1_p100406.ebuild |
| 4 |
Added: ccpn-2.1.3.1_p100409.ebuild |
| 5 |
Log: |
| 6 |
Todays Python Patches |
| 7 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.24 sci-chemistry/ccpn/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/ChangeLog?rev=1.24&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/ChangeLog?rev=1.24&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/ChangeLog?r1=1.23&r2=1.24 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v |
| 19 |
retrieving revision 1.23 |
| 20 |
retrieving revision 1.24 |
| 21 |
diff -u -r1.23 -r1.24 |
| 22 |
--- ChangeLog 6 Apr 2010 13:29:58 -0000 1.23 |
| 23 |
+++ ChangeLog 9 Apr 2010 06:09:40 -0000 1.24 |
| 24 |
@@ -1,6 +1,12 @@ |
| 25 |
# ChangeLog for sci-chemistry/ccpn |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.23 2010/04/06 13:29:58 jlec Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.24 2010/04/09 06:09:40 jlec Exp $ |
| 29 |
+ |
| 30 |
+*ccpn-2.1.3.1_p100409 (09 Apr 2010) |
| 31 |
+ |
| 32 |
+ 09 Apr 2010; Justin Lecher <jlec@g.o> ccpn-2.1.3.1_p100406.ebuild, |
| 33 |
+ +ccpn-2.1.3.1_p100409.ebuild: |
| 34 |
+ Todays Python Patches |
| 35 |
|
| 36 |
*ccpn-2.1.3.1_p100406 (06 Apr 2010) |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.2 sci-chemistry/ccpn/ccpn-2.1.3.1_p100406.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100406.ebuild?rev=1.2&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100406.ebuild?rev=1.2&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100406.ebuild?r1=1.1&r2=1.2 |
| 46 |
|
| 47 |
Index: ccpn-2.1.3.1_p100406.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100406.ebuild,v |
| 50 |
retrieving revision 1.1 |
| 51 |
retrieving revision 1.2 |
| 52 |
diff -u -r1.1 -r1.2 |
| 53 |
--- ccpn-2.1.3.1_p100406.ebuild 6 Apr 2010 13:29:58 -0000 1.1 |
| 54 |
+++ ccpn-2.1.3.1_p100406.ebuild 9 Apr 2010 06:09:40 -0000 1.2 |
| 55 |
@@ -1,6 +1,6 @@ |
| 56 |
# Copyright 1999-2010 Gentoo Foundation |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100406.ebuild,v 1.1 2010/04/06 13:29:58 jlec Exp $ |
| 59 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100406.ebuild,v 1.2 2010/04/09 06:09:40 jlec Exp $ |
| 60 |
|
| 61 |
EAPI="3" |
| 62 |
PYTHON_DEPEND="2:2.5" |
| 63 |
@@ -27,6 +27,8 @@ |
| 64 |
dev-lang/tk |
| 65 |
dev-python/numpy |
| 66 |
dev-tcltk/tix |
| 67 |
+ x11-libs/libXext |
| 68 |
+ x11-libs/libX11 |
| 69 |
opengl? ( virtual/glut )" |
| 70 |
DEPEND="${RDEPEND}" |
| 71 |
RESTRICT_PYTHON_ABIS="2.4 3.*" |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
1.1 sci-chemistry/ccpn/ccpn-2.1.3.1_p100409.ebuild |
| 76 |
|
| 77 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100409.ebuild?rev=1.1&view=markup |
| 78 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100409.ebuild?rev=1.1&content-type=text/plain |
| 79 |
|
| 80 |
Index: ccpn-2.1.3.1_p100409.ebuild |
| 81 |
=================================================================== |
| 82 |
# Copyright 1999-2010 Gentoo Foundation |
| 83 |
# Distributed under the terms of the GNU General Public License v2 |
| 84 |
# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100409.ebuild,v 1.1 2010/04/09 06:09:40 jlec Exp $ |
| 85 |
|
| 86 |
EAPI="3" |
| 87 |
PYTHON_DEPEND="2:2.5" |
| 88 |
SUPPORT_PYTHON_ABIS="1" |
| 89 |
PYTHON_USE_WITH="ssl tk" |
| 90 |
|
| 91 |
inherit eutils portability python toolchain-funcs versionator |
| 92 |
|
| 93 |
PATCHSET="${PV##*_p}" |
| 94 |
MY_PN="${PN}mr" |
| 95 |
MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})" |
| 96 |
|
| 97 |
DESCRIPTION="The Collaborative Computing Project for NMR" |
| 98 |
SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz" |
| 99 |
[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${PATCHSET}.patch.bz2" |
| 100 |
HOMEPAGE="http://www.ccpn.ac.uk/ccpn" |
| 101 |
|
| 102 |
SLOT="0" |
| 103 |
LICENSE="|| ( CCPN LGPL-2.1 )" |
| 104 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 105 |
IUSE="+opengl" |
| 106 |
|
| 107 |
RDEPEND=" |
| 108 |
dev-lang/tk |
| 109 |
dev-python/numpy |
| 110 |
dev-tcltk/tix |
| 111 |
x11-libs/libXext |
| 112 |
x11-libs/libX11 |
| 113 |
opengl? ( virtual/glut )" |
| 114 |
DEPEND="${RDEPEND}" |
| 115 |
RESTRICT_PYTHON_ABIS="2.4 3.*" |
| 116 |
|
| 117 |
RESTRICT="mirror" |
| 118 |
S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV}) |
| 119 |
|
| 120 |
src_prepare() { |
| 121 |
[[ -n ${PATCHSET} ]] && \ |
| 122 |
epatch "${WORKDIR}"/ccpn-update-${PATCHSET}.patch |
| 123 |
|
| 124 |
epatch "${FILESDIR}"/${MY_PV}-parallel.patch |
| 125 |
epatch "${FILESDIR}"/${MY_PV}-dynamics.patch |
| 126 |
|
| 127 |
local tk_ver |
| 128 |
local myconf |
| 129 |
|
| 130 |
tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)" |
| 131 |
|
| 132 |
if use opengl; then |
| 133 |
GLUT_NEED_INIT="-DNEED_GLUT_INIT" |
| 134 |
IGNORE_GL_FLAG="" |
| 135 |
GL_FLAG="-DUSE_GL_FALSE" |
| 136 |
GL_DIR="${EPREFIX}/usr" |
| 137 |
GL_LIB="-lglut -lGLU -lGL" |
| 138 |
GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include" |
| 139 |
GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)" |
| 140 |
|
| 141 |
else |
| 142 |
IGNORE_GL_FLAG="-DIGNORE_GL" |
| 143 |
GL_FLAG="-DUSE_GL_FALSE" |
| 144 |
fi |
| 145 |
|
| 146 |
GLUT_NOT_IN_GL="" |
| 147 |
GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)" |
| 148 |
|
| 149 |
python_copy_sources |
| 150 |
|
| 151 |
preparation() { |
| 152 |
sed \ |
| 153 |
-e "s:/usr:${EPREFIX}/usr:g" \ |
| 154 |
-e "s:^\(CC =\).*:\1 $(tc-getCC):g" \ |
| 155 |
-e "s:^\(OPT_FLAG =\).*:\1 ${CFLAGS}:g" \ |
| 156 |
-e "s:^\(LINK_FLAGS =.*\):\1 ${LDFLAGS}:g" \ |
| 157 |
-e "s:^\(IGNORE_GL_FLAG =\).*:\1 ${IGNORE_GL_FLAG}:g" \ |
| 158 |
-e "s:^\(GL_FLAG =\).*:\1 ${GL_FLAG}:g" \ |
| 159 |
-e "s:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \ |
| 160 |
-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \ |
| 161 |
-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \ |
| 162 |
-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}:g" \ |
| 163 |
-e "s:^\(GLUT_NEED_INIT =\).*:\1 ${GLUT_NEED_INIT}:g" \ |
| 164 |
-e "s:^\(GLUT_NOT_IN_GL =\).*:\1:g" \ |
| 165 |
-e "s:^\(X11_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \ |
| 166 |
-e "s:^\(TCL_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \ |
| 167 |
-e "s:^\(TK_LIB_FLAGS =\).*:\1 -L${EPREFIX}/usr/$(get_libdir):g" \ |
| 168 |
-e "s:^\(PYTHON_INCLUDE_FLAGS =\).*:\1 -I\$(PYTHON_DIR)/include/python$(python_get_version):g" \ |
| 169 |
-e "s:^\(PYTHON_LIB =\).*:\1 -lpython$(python_get_version):g" \ |
| 170 |
c/environment_default.txt > c/environment.txt |
| 171 |
} |
| 172 |
python_execute_function -s preparation |
| 173 |
} |
| 174 |
|
| 175 |
src_compile() { |
| 176 |
building() { |
| 177 |
emake -C c all links |
| 178 |
} |
| 179 |
python_execute_function -s building |
| 180 |
} |
| 181 |
|
| 182 |
src_install() { |
| 183 |
local libdir |
| 184 |
local tkver |
| 185 |
|
| 186 |
libdir=$(get_libdir) |
| 187 |
tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2) |
| 188 |
|
| 189 |
for wrapper in analysis dangle dataShifter eci formatConverter pipe2azara; do |
| 190 |
sed -e "s:gentoo_sitedir:${EPREFIX}/$(python_get_sitedir -f):g" \ |
| 191 |
-e "s:gentoolibdir:${EPREFIX}/usr/${libdir}:g" \ |
| 192 |
-e "s:gentootk:${EPREFIX}/usr/${libdir}/tk${tkver}:g" \ |
| 193 |
-e "s:gentootcl:${EPREFIX}/usr/${libdir}/tclk${tkver}:g" \ |
| 194 |
-e "s:gentoopython:${EPREFIX}/usr/bin/python:g" \ |
| 195 |
"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}" |
| 196 |
dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}" |
| 197 |
done |
| 198 |
|
| 199 |
installation() { |
| 200 |
local in_path |
| 201 |
local files |
| 202 |
|
| 203 |
in_path=$(python_get_sitedir)/${PN} |
| 204 |
|
| 205 |
for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do |
| 206 |
sed \ |
| 207 |
-e 's:#from __future__:from __future__:g' \ |
| 208 |
-i ${i} |
| 209 |
done |
| 210 |
|
| 211 |
insinto ${in_path} |
| 212 |
|
| 213 |
dodir ${in_path}/c |
| 214 |
|
| 215 |
ebegin "Installing main files" |
| 216 |
doins -r data model python || die "main files installation failed" |
| 217 |
eend |
| 218 |
|
| 219 |
dohtml -r doc/* || die |
| 220 |
dosym ../../../../share/doc/${PF}/html ${in_path}/doc || die |
| 221 |
|
| 222 |
einfo "Adjusting permissions" |
| 223 |
|
| 224 |
files="ccpnmr/c/ContourFile.so |
| 225 |
ccpnmr/c/ContourLevels.so |
| 226 |
ccpnmr/c/ContourStyle.so |
| 227 |
ccpnmr/c/PeakList.so |
| 228 |
ccpnmr/c/SliceFile.so |
| 229 |
ccpnmr/c/WinPeakList.so |
| 230 |
ccpnmr/c/AtomCoordList.so |
| 231 |
ccpnmr/c/AtomCoord.so |
| 232 |
ccpnmr/c/Bacus.so |
| 233 |
ccpnmr/c/CloudUtil.so |
| 234 |
ccpnmr/c/DistConstraintList.so |
| 235 |
ccpnmr/c/DistConstraint.so |
| 236 |
ccpnmr/c/DistForce.so |
| 237 |
ccpnmr/c/Dynamics.so |
| 238 |
ccpnmr/c/Midge.so |
| 239 |
ccp/c/StructAtom.so |
| 240 |
ccp/c/StructBond.so |
| 241 |
ccp/c/StructStructure.so |
| 242 |
ccp/c/StructUtil.so |
| 243 |
memops/c/BlockFile.so |
| 244 |
memops/c/FitMethod.so |
| 245 |
memops/c/GlHandler.so |
| 246 |
memops/c/MemCache.so |
| 247 |
memops/c/PdfHandler.so |
| 248 |
memops/c/PsHandler.so |
| 249 |
memops/c/ShapeFile.so |
| 250 |
memops/c/StoreFile.so |
| 251 |
memops/c/StoreHandler.so |
| 252 |
memops/c/TkHandler.so" |
| 253 |
|
| 254 |
for FILE in ${files}; do |
| 255 |
fperms 755 ${in_path}/python/${FILE} |
| 256 |
done |
| 257 |
} |
| 258 |
python_execute_function -s installation |
| 259 |
} |
| 260 |
|
| 261 |
pkg_postinst() { |
| 262 |
python_mod_optimize ${PN} |
| 263 |
} |
| 264 |
|
| 265 |
pkg_postrm() { |
| 266 |
python_mod_cleanup ${PN} |
| 267 |
} |
Archives