Version Bump

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

3 files changed, 233 insertions, 5 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 3fa851004b19..28b6bba31b12 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +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.43 2010/10/24 11:28:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.44 2010/11/04 21:56:29 jlec Exp $
+
+*ccpn-2.1.5_p101104 (04 Nov 2010)
+
+  04 Nov 2010; Justin Lecher <jlec@gentoo.org> +ccpn-2.1.5_p101104.ebuild:
+  Version Bump
 
 *ccpn-2.1.5_p101024 (24 Oct 2010)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index adcc2d3010ad..9912e150486d 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -18,15 +18,17 @@ DIST analysis2.1.5.tar.gz 20338459 RMD160 b0706c859c1ee4da2ab80ee41534197268f73d
 DIST ccpn-update-100806.patch.bz2 187965 RMD160 3297162fe3314aa405ee58737ce45cda084834e5 SHA1 338423d9f36da3fb10dc9d9a3b8aeb932ae3bfd0 SHA256 5cea7899edb96237a6674f04a1beee6ad7b309e12964ea8b25d9ea6ff752d0d4
 DIST ccpn-update-101020.patch.bz2 37643 RMD160 2ebdef4783f420589026870bc319c33c4b210953 SHA1 4b114192862b461822907732620dfbefc82f985f SHA256 893f49a264af9335a3bcf11b4165f66a62f36adf052c75eacdf78c3a4e7a8ce8
 DIST ccpn-update-101024.patch.bz2 37972 RMD160 2f4abf1760ff65cedffdf46c364c905fbd9a0cc2 SHA1 4b9d0fa703335326d08ebd14e31bd8ef527ced59 SHA256 df0ecc568ec4bd3edd9b5f16c852dfe3c8d058bedd8dd7c16b46cadef13b569c
+DIST ccpn-update-101104.patch.bz2 41695 RMD160 b133dbb368141a7b9da4143e2ccf9759e3014560 SHA1 d0e03684c2cfc96df9fd6af68b9e350469f532f1 SHA256 c401ceac25f3a196b40a98e82865845e8da8ea611b3ba97b9dc339e9b6c1c2b8
 EBUILD ccpn-2.1.3.1_p100806.ebuild 5190 RMD160 c1dd4e2443ab5cf8386627a9feba25be6e61b715 SHA1 0d9700191a04c6ed5f106e2712b010d499315827 SHA256 ed26ef362193f91d4726fd49a1c4b19c1f975c3847b0616ada2e64ce7a90ffa5
 EBUILD ccpn-2.1.5_p101020.ebuild 5987 RMD160 d30032f094aa48f91602c9faf0bf5f3f993d4c3a SHA1 d10dac38e6a66ff605be4b5a6620d46b9f86a41a SHA256 b389e10458b72258c9128ea5cc8423044bf974ecba618fae6afe507dde64283f
 EBUILD ccpn-2.1.5_p101024.ebuild 6069 RMD160 b6c8558410f9963f525f72635994d55a771c34c9 SHA1 5ce05ede0691b97f005bdc38aeef698df8e7f7de SHA256 6f7949166bc4369e9234d91e76c13f6def77b5cfd20677f911324b810c222549
-MISC ChangeLog 7407 RMD160 ad6cf6d8cb6e5622171af6bd0487de00663ced51 SHA1 95afa3b9432b7a468b4f83fb7027b1f5d6450201 SHA256 f09da16ba2ec54c9e81dfb2f48eb7bfaea41f3c277555bd36431ba449f11455f
+EBUILD ccpn-2.1.5_p101104.ebuild 6069 RMD160 bf024e86792b8fafeaeb6e4850ec9c1bef55f1b7 SHA1 52f1d44daa6c23cafd965f8f6ce84f07549ad75c SHA256 50160ac4d722de71dd22d92f04fdac21da141cce5327d48658eff7112daf357c
+MISC ChangeLog 7533 RMD160 cb47f0fccc06ca54b343e9ccf944887689ca4f24 SHA1 efca12b0c6569c91ea4821968253ae253fb16ded SHA256 496cd37f68bb8b1885c7826fb303742b52cd442e40b536002ed951d6538188d5
 MISC metadata.xml 317 RMD160 6e56ad407f163d80504468f6fedcfb35fc31db00 SHA1 30b72b0612b1f91712537d24e3a2407eec50e1dd SHA256 1fb093ab05124dcd078fc93a4aa6f787f5829066e100ed98da8ecf65cece63fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzEGH4ACgkQgAnW8HDreRZysQCeM2rNht+6dkjZQ83DKtjNPqJO
-SQkAnR7/un6L6e/EH38y9i8T/1se5PkN
-=k8DL
+iEYEARECAAYFAkzTLBMACgkQgAnW8HDreRbPUwCfdo/TGNhyKPmZD/POGntuVS2N
+DjYAoJU1wtCyP0ILmWL6VfDKHYf34IAO
+=NriB
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p101104.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p101104.ebuild
new file mode 100644
index 000000000000..5e9633241fb0
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.1.5_p101104.ebuild
@@ -0,0 +1,221 @@
+# 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.5_p101104.ebuild,v 1.1 2010/11/04 21:56:29 jlec Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_USE_WITH="ssl tk"
+RESTRICT_PYTHON_ABIS="2.4 3.*"
+
+inherit eutils portability python toolchain-funcs versionator
+
+PATCHSET="${PV##*_p}"
+MY_PN="${PN}mr"
+MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
+MY_MAJOR="$(get_version_component_range 1-3)"
+
+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="extendnmr +opengl"
+
+RDEPEND="
+	dev-lang/tk[threads]
+	>=dev-python/numpy-1.4
+	>=dev-tcltk/tix-8.4.3
+	=sci-libs/ccpn-data-"${MY_MAJOR}"*
+	x11-libs/libXext
+	x11-libs/libX11
+	extendnmr? (
+		sci-chemistry/aria
+		sci-chemistry/prodecomp )
+	opengl? (
+		media-libs/freeglut
+		dev-python/pyglet )"
+# We need to fix this
+#		sci-chemistry/mdd
+DEPEND="${RDEPEND}"
+
+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
+
+	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)"
+
+	rm -rf data model doc license || die
+	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:^\(GL_DIR =\).*:\1 ${GL_DIR}:g" \
+			-e "s:^\(GL_LIB =\).*:\1 ${GL_LIB}:g" \
+			-e "s:^\(GL_LIB_FLAGS =\).*:\1 ${GL_LIB_FLAGS}:g" \
+			-e "s:^\(GL_INCLUDE_FLAGS =\).*:\1 ${GL_INCLUDE_FLAGS}: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" \
+			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
+	local _wrapper
+
+	find . -name "*.pyc" -type d -delete
+
+	libdir=$(get_libdir)
+	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
+
+	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
+	use extendnmr && _wrapper="${_wrapper} extendNmr"
+	for wrapper in ${_wrapper}; 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" \
+			-e "s://:/:g" \
+			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
+		dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
+	done
+
+	installation() {
+		local in_path
+		local files
+		local pydocs
+
+		pydocs="$(find python -name doc -type d)"
+		rm -rf ${pydocs} || die
+
+		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} || 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="
+			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
+	}
+	python_execute_function -s installation
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}