Version Bump

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 198 insertions, 5 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 4bebadd45a1c..1d06cc69f964 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.29 2010/06/07 06:52:32 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.30 2010/06/28 06:27:26 jlec Exp $
+
+*ccpn-2.1.3.1_p100628 (28 Jun 2010)
+
+  28 Jun 2010; Justin Lecher <jlec@gentoo.org> +ccpn-2.1.3.1_p100628.ebuild:
+  Version Bump
 
 *ccpn-2.1.3.1_p100607 (07 Jun 2010)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index de5886e1d22b..7997be4d1d54 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -17,15 +17,17 @@ 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-100519.patch.bz2 136871 RMD160 34e91278eaa0f29eaca569033a3960440060b729 SHA1 32a6647b8e166748c539e990c0b2d1b21b995a23 SHA256 69f8d647ab0bb7d6d7fbc6f8a23b8164d97916dcef3b0b50137902084ad2b99e
 DIST ccpn-update-100607.patch.bz2 148229 RMD160 5154191926916e592ae3f3bede35937b93ec33be SHA1 0035824a5901276ba9b0d2efeee5e30d88264d32 SHA256 d9ed5dc5c56ea1f65a6e8d567d177a6ed5733d1281cb798e8e4c00f066f86821
+DIST ccpn-update-100628.patch.bz2 171691 RMD160 a7cd100c5fa5a3d5d3bda8eb7c5ef813e5a4c476 SHA1 c975d3f1125eca2983e558780e63d400f17fb341 SHA256 aec560829b43d1f4d9facc8a13f54c0e47799f21d67aceb05be30aeb647d9c15
 EBUILD ccpn-2.1.2.1_p100216.ebuild 4880 RMD160 e892baef0d74df30f40e5b393c893159bd08dda5 SHA1 e1a7a09588aa2f4e341e5d94f5260072dab10474 SHA256 7777534b663f05898cf40cc1f7114b2a6de38343fe5ab31f14d4c4c4f2456c47
 EBUILD ccpn-2.1.3.1_p100519.ebuild 5137 RMD160 a1e3bf959be4d0b0738fd49145470f41119c1137 SHA1 3f9d0195056fe4608f086ec51bf8ce594d4c947c SHA256 cc3dc5bcc874f45b75016276f81b2e771197b3bf3eb187d6c95953fddf5847d5
 EBUILD ccpn-2.1.3.1_p100607.ebuild 5137 RMD160 afa602fe700c230b52ddb64ac25a7a843efefa0b SHA1 fbefd8b8b7c2decc29992c55466e90cf3c93777e SHA256 81162c3e317b78d2d5206c8c03cb141c7641826864890b73d54c94c9654771a2
-MISC ChangeLog 5084 RMD160 f1936f13167fad4d90a53c39715de7125c2bb03f SHA1 c16a25207623e52281a2764fa251e4615cb4dde3 SHA256 cd133be631c3ebbd4bfaee861525e5b4c574e7be7928a76c72f4530e2a50e314
+EBUILD ccpn-2.1.3.1_p100628.ebuild 5137 RMD160 0b0e76b148209bb42e4e52bc67cae3a333264528 SHA1 30030425d79c300789db4f40627fe63318991b81 SHA256 9636d7213b9077a36c3a2e6bd0e29dac6d36789e9940b5965f87b0473e35c8a8
+MISC ChangeLog 5214 RMD160 e1f4cf927a31bb5b37ee632901850e397ee018b5 SHA1 821e594d5b3f646b15fe0334472a5820415bba47 SHA256 293e21c01d0c1e49cd1ff912c8e7e20c82a12bbf7afdeb2e4001cf9ecf1fa043
 MISC metadata.xml 226 RMD160 0355d90bd8d1c106a19b136045ebdf970a0a2485 SHA1 1db0b2a470657641079d6613829df49a5c043ed6 SHA256 094a3ac740c81b9afbff3c855ba93cc20a593cad2392f6f4404715608a836fa1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwMlz8ACgkQgAnW8HDreRb0FACgsDYLiyfvVGcpUCuL8yAu2jC4
-oxkAoMQnI1P8YmyntiLF3LaRSxFMbmFq
-=Odd9
+iEYEARECAAYFAkwoQNUACgkQgAnW8HDreRYzFgCgmT/60x4Cx+2zvYj+3NKBMeC5
+ZIQAoKCJG4DjTzCdMys5uoJ2JdypHBcD
+=MHBB
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100628.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100628.ebuild
new file mode 100644
index 000000000000..dbc006c98385
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100628.ebuild
@@ -0,0 +1,186 @@
+# 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_p100628.ebuild,v 1.1 2010/06/28 06:27:26 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
+	x11-libs/libXext
+	x11-libs/libX11
+	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:^\(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
+
+	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}
+}