Todays python patches; drop LD_LIBRARY_PATH from launcher

(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

11 files changed, 174 insertions, 10 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 0f8ef90ec58d..9f4aaea176e0 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/ccpn
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.161 2015/02/24 16:30:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.162 2015/02/26 07:50:22 jlec Exp $
+
+*ccpn-2.4.1_p150226 (26 Feb 2015)
+
+  26 Feb 2015; Justin Lecher <jlec@gentoo.org> +ccpn-2.4.1_p150226.ebuild,
+  files/analysis, files/dangle, files/dataShifter, files/depositionFileImporter,
+  files/eci, files/extendNmr, files/formatConverter, files/pipe2azara,
+  files/xeasy2azara:
+  Todays python patches; drop LD_LIBRARY_PATH from launcher
 
 *ccpn-2.4.1_p150224 (24 Feb 2015)
 
diff --git a/sci-chemistry/ccpn/ccpn-2.4.1_p150226.ebuild b/sci-chemistry/ccpn/ccpn-2.4.1_p150226.ebuild
new file mode 100644
index 000000000000..f9b540e85161
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.4.1_p150226.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.4.1_p150226.ebuild,v 1.1 2015/02/26 07:50:22 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl,tk"
+
+inherit eutils flag-o-matic multilib portability python-single-r1 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"
+HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
+SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
+[[ -n ${PATCHSET} ]] \
+	&& SRC_URI+=" http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
+
+SLOT="0"
+LICENSE="|| ( CCPN LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+opengl"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/tk[threads]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-tcltk/tix
+	=sci-libs/ccpn-data-"${MY_MAJOR}"*[${PYTHON_USEDEP}]
+	sci-biology/psipred
+	x11-libs/libXext
+	x11-libs/libX11
+	opengl? (
+		media-libs/freeglut
+		dev-python/pyglet[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2)
+
+src_prepare() {
+	[[ -n ${PATCHSET} ]] && \
+		EPATCH_OPTS="-p2" epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
+
+	epatch "${FILESDIR}"/2.3.1-parallel.patch
+
+	append-lfs-flags
+
+	sed \
+		-e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
+		-e "s:weights_s:weights:g" \
+		-i python/ccpnmr/analysis/wrappers/Psipred.py || die
+
+	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_TRUE"
+		GL_DIR="${EPREFIX}/usr"
+		GL_LIB="-lglut -lGLU -lGL"
+		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
+		GL_LIB_FLAGS=""
+	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
+
+	sed \
+		-e "s|/usr|${EPREFIX}/usr|g" \
+		-e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+		-e "s|^\(OPT_FLAG =\).*|\1 ${CPPFLAGS} ${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 =\).*|\1 -ltk|g" \
+		-e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+		-e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I$(python_get_includedir)|g" \
+		-e "s|^\(PYTHON_LIB =\).*|\1 -l${EPYTHON}|g" \
+		c/environment_default.txt > c/environment.txt || die
+
+	sed \
+		-e 's:ln -s:cp -f:g' \
+		-i $(find python -name linkSharedObjs) || die
+}
+
+src_compile() {
+	emake -C c all
+	emake -C c links
+}
+
+src_install() {
+	local libdir
+	local tkver
+	local _wrapper
+
+	find . -name "*.pyc" -type f -delete || die
+
+	libdir=$(get_libdir)
+	tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
+
+	_wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara extendNmr"
+	for wrapper in ${_wrapper}; do
+		sed \
+			-e "s|gentoo_sitedir|$(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|${EPYTHON}|g" \
+			-e "s|gentoousr|${EPREFIX}/usr|g" \
+			-e "s|//|/|g" \
+			"${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
+		dobin "${T}"/${wrapper}
+	done
+
+	local in_path=$(python_get_sitedir)/${PN}
+	local files
+	local pydocs
+
+	pydocs="$(find python -name doc -type d)"
+	rm -rf ${pydocs} || die
+
+	for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
+	sed \
+		-e 's|#from __future__|from __future__|g' \
+		-i ${i} || die
+	done
+
+	dodir ${in_path#${EPREFIX}}/c
+
+	ebegin "Installing main files"
+		python_moduleinto ${PN}
+		python_domodule python
+	eend
+
+	ebegin "Adjusting permissions"
+	for _file in $(find "${ED}" -type f -name "*so"); do
+		chmod 755 ${_file}
+	done
+	eend
+	python_optimize
+}
diff --git a/sci-chemistry/ccpn/files/analysis b/sci-chemistry/ccpn/files/analysis
index 30250f09195e..828ed4e64ae9 100644
--- a/sci-chemistry/ccpn/files/analysis
+++ b/sci-chemistry/ccpn/files/analysis
@@ -2,7 +2,6 @@
 
 export CCPNMR_TOP_DIR=gentoo_sitedir
 export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
-export LD_LIBRARY_PATH=gentoolibdir
 export TCL_LIBRARY=gentootcl
 export TK_LIBRARY=gentootk
 export PSIPRED_DIR=gentoousr
diff --git a/sci-chemistry/ccpn/files/dangle b/sci-chemistry/ccpn/files/dangle
index fe2bccb1107f..6d8a42e615de 100644
--- a/sci-chemistry/ccpn/files/dangle
+++ b/sci-chemistry/ccpn/files/dangle
@@ -2,7 +2,6 @@
 
 export CCPNMR_TOP_DIR=gentoo_sitedir
 export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
-export LD_LIBRARY_PATH=gentoolibdir
 export TCL_LIBRARY=gentootcl
 export TK_LIBRARY=gentootk
 export PSIPRED_DIR=gentoousr
diff --git a/sci-chemistry/ccpn/files/dataShifter b/sci-chemistry/ccpn/files/dataShifter
index a5b7f9059916..c083960f2f60 100644
--- a/sci-chemistry/ccpn/files/dataShifter
+++ b/sci-chemistry/ccpn/files/dataShifter
@@ -2,7 +2,6 @@
 
 export CCPNMR_TOP_DIR=gentoo_sitedir
 export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
-export LD_LIBRARY_PATH=gentoolibdir
 export TCL_LIBRARY=gentootcl
 export TK_LIBRARY=gentootk
 export PSIPRED_DIR=gentoousr
diff --git a/sci-chemistry/ccpn/files/depositionFileImporter b/sci-chemistry/ccpn/files/depositionFileImporter
index 7f3a70f725e8..09505ccc4925 100644
--- a/sci-chemistry/ccpn/files/depositionFileImporter
+++ b/sci-chemistry/ccpn/files/depositionFileImporter
@@ -2,7 +2,6 @@
 
 export CCPNMR_TOP_DIR=gentoo_sitedir
 export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
-export LD_LIBRARY_PATH=gentoolibdir
 export TCL_LIBRARY=gentootcl
 export TK_LIBRARY=gentootk
 export PSIPRED_DIR=gentoousr
diff --git a/sci-chemistry/ccpn/files/eci b/sci-chemistry/ccpn/files/eci
index 40472bc06e8d..54d913348718 100644
--- a/sci-chemistry/ccpn/files/eci
+++ b/sci-chemistry/ccpn/files/eci
@@ -2,7 +2,6 @@
 
 export CCPNMR_TOP_DIR=gentoo_sitedir
 export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
-export LD_LIBRARY_PATH=gentoolibdir
 export TCL_LIBRARY=gentootcl
 export TK_LIBRARY=gentootk
 export PSIPRED_DIR=gentoousr
diff --git a/sci-chemistry/ccpn/files/extendNmr b/sci-chemistry/ccpn/files/extendNmr
index e29298038c13..a2fe4c997c7c 100644
--- a/sci-chemistry/ccpn/files/extendNmr
+++ b/sci-chemistry/ccpn/files/extendNmr
@@ -2,7 +2,6 @@
 
 export CCPNMR_TOP_DIR=gentoo_sitedir
 export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
-export LD_LIBRARY_PATH=gentoolibdir
 export TCL_LIBRARY=gentootcl
 export TK_LIBRARY=gentootk
 export PSIPRED_DIR=gentoousr
diff --git a/sci-chemistry/ccpn/files/formatConverter b/sci-chemistry/ccpn/files/formatConverter
index b310e0d6a426..6cb273612352 100644
--- a/sci-chemistry/ccpn/files/formatConverter
+++ b/sci-chemistry/ccpn/files/formatConverter
@@ -2,7 +2,6 @@
 
 export CCPNMR_TOP_DIR=gentoo_sitedir
 export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
-export LD_LIBRARY_PATH=gentoolibdir
 export TCL_LIBRARY=gentootcl
 export TK_LIBRARY=gentootk
 export PSIPRED_DIR=gentoousr
diff --git a/sci-chemistry/ccpn/files/pipe2azara b/sci-chemistry/ccpn/files/pipe2azara
index 48b47342c501..5a3710a134a7 100644
--- a/sci-chemistry/ccpn/files/pipe2azara
+++ b/sci-chemistry/ccpn/files/pipe2azara
@@ -2,7 +2,6 @@
 
 export CCPNMR_TOP_DIR=gentoo_sitedir
 export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
-export LD_LIBRARY_PATH=gentoolibdir
 export TCL_LIBRARY=gentootcl
 export TK_LIBRARY=gentootk
 export PSIPRED_DIR=gentoousr
diff --git a/sci-chemistry/ccpn/files/xeasy2azara b/sci-chemistry/ccpn/files/xeasy2azara
index f2775ade0510..7b73714c2fa5 100644
--- a/sci-chemistry/ccpn/files/xeasy2azara
+++ b/sci-chemistry/ccpn/files/xeasy2azara
@@ -2,7 +2,6 @@
 
 export CCPNMR_TOP_DIR=gentoo_sitedir
 export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
-export LD_LIBRARY_PATH=gentoolibdir
 export TCL_LIBRARY=gentootcl
 export TK_LIBRARY=gentootk
 export PSIPRED_DIR=gentoousr