Pyhton Bump, Fixes for new X server and nvidia drivers

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

5 files changed, 17 insertions, 440 deletions

diff --git a/sci-chemistry/ccpn/ChangeLog b/sci-chemistry/ccpn/ChangeLog
index 6b48c2d60834..5d4c5fa9a432 100644
--- a/sci-chemistry/ccpn/ChangeLog
+++ b/sci-chemistry/ccpn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/ccpn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.52 2011/01/25 14:16:36 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ChangeLog,v 1.53 2011/02/02 17:18:02 jlec Exp $
+
+*ccpn-2.1.5_p110202 (02 Feb 2011)
+
+  02 Feb 2011; Justin Lecher <jlec@gentoo.org> -ccpn-2.1.5_p110105.ebuild,
+  -ccpn-2.1.5_p110113.ebuild, -ccpn-2.1.5_p110125.ebuild,
+  +ccpn-2.1.5_p110202.ebuild:
+  Pyhton Bump, Fixes for new X server and nvidia drivers
 
 *ccpn-2.1.5_p110125 (25 Jan 2011)
 
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index f89bc5563add..45dbc6acd4ae 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -16,19 +16,15 @@ AUX pipe2azara 297 RMD160 0cd01c0cf629710ff4b4267d9449b0b1f3d586e1 SHA1 16566033
 DIST analysis2.1.3_1.tar.gz 18932918 RMD160 5f19ea6fe47c2910d16fcba8d1a78f0e1dead731 SHA1 683bdfb17d14979eb6477aaa99e4c4af5003beb2 SHA256 bbc1ba5434f896d38b6745c1dc9adc470a78d3be7b879160edcd635a19228b74
 DIST analysis2.1.5.tar.gz 20338459 RMD160 b0706c859c1ee4da2ab80ee41534197268f73d44 SHA1 70dc5e6b2752d6b7d5c8673fc992ebd0a88e6ad0 SHA256 9f91f1bd56fb73fd24e71d396c96c0f0d31b92287664b6a2e756f6efc630b31b
 DIST ccpn-update-100806.patch.bz2 187965 RMD160 3297162fe3314aa405ee58737ce45cda084834e5 SHA1 338423d9f36da3fb10dc9d9a3b8aeb932ae3bfd0 SHA256 5cea7899edb96237a6674f04a1beee6ad7b309e12964ea8b25d9ea6ff752d0d4
-DIST ccpn-update-110105.patch.bz2 47734 RMD160 0628b1bf5b5e7479abc587efb7a359e91c265b35 SHA1 b9271bb09fc676420b0c517a2a4e13d89ca0d02a SHA256 f107d9ccf6b699a63a95e5cf72950d9e23dcb8bcde17f64246f73694594912fa
-DIST ccpn-update-110113.patch.bz2 53812 RMD160 3d515870a7307de06a292a70adb88e1644ae92b0 SHA1 df05b65192d9e955e059139a12a80e8c32712561 SHA256 e4a87b0404cca92a633f649e81bd473e6d4362740bc8096bf15619a203fee48b
-DIST ccpn-update-110125.patch.bz2 54126 RMD160 c97bd230c39175bd6d21438ce190430bba9aeee4 SHA1 a49506ab2ab67728aa16dc1d8e0251c4a7210edb SHA256 06e357201d037d5c986239139a8f6905b96bb1856090d8dbf1a6934d38cc7b28
+DIST ccpn-update-110202.patch.bz2 54603 RMD160 81d4123e155816c372702084a8d1433e256ec365 SHA1 57f4496f51b9e16b1eb5b85dcb332b032e61da97 SHA256 9f2dd2106ceef1fb120ee9d1f5973e2ac8105c260c8e981b429211738747fb02
 EBUILD ccpn-2.1.3.1_p100806.ebuild 5190 RMD160 c1dd4e2443ab5cf8386627a9feba25be6e61b715 SHA1 0d9700191a04c6ed5f106e2712b010d499315827 SHA256 ed26ef362193f91d4726fd49a1c4b19c1f975c3847b0616ada2e64ce7a90ffa5
-EBUILD ccpn-2.1.5_p110105.ebuild 5764 RMD160 b22d590aaf7d11855d6229b9ff4c52759d5c5c67 SHA1 2cf7697157d9b2dd0d78421b4fde258454939824 SHA256 fdd4c9650e6f083de59a7285c6de5420abd02598194c8beb2c70e4ec20c34c36
-EBUILD ccpn-2.1.5_p110113.ebuild 5764 RMD160 6d62377609aca81ef5dd3af20902976a75aa0446 SHA1 9a8dc3975a0a822e9e7971dee0a1f692d140800e SHA256 32a0bdff0b2f71375ff4553170a4638d42d9b1aca6889b3b7c7cedcef3922e83
-EBUILD ccpn-2.1.5_p110125.ebuild 5764 RMD160 7a88542a04c1f723afb6b69aeab7881182b2b25c SHA1 53ebb302506afde1603515d61b15f2dad22409f2 SHA256 8027ddedc96c08bf80d8298682fd87c76e8539887207c782e3badd3c0467fccb
-MISC ChangeLog 8867 RMD160 a11cbf8c8d5c2ae4f5d51936d9a2720e0ae28bd5 SHA1 81ee55821b04b8700278e35b1b27ed4780e8fba1 SHA256 f1976fe7fedf37c0a0ca9a62163b987ca5dd3771cfc3310813d9da9e23b937f3
+EBUILD ccpn-2.1.5_p110202.ebuild 5770 RMD160 98c49d481a5a0e28d2f62b303950bab3467c3246 SHA1 2fb5b0d792b4dcfac20f4d11d405104ab5f81129 SHA256 77d1d7239204ffa4247501133996478e13f07b863fdfebe5d4b056089f9e08ba
+MISC ChangeLog 9123 RMD160 28a28e9387d06392631811f98523018ef6884526 SHA1 607acf1aaf25db3fc4df131affe2e9440d3efb44 SHA256 7c1aaa25f8662b6667cbb4df9b08b099c391152f7283df8baf53cebb8d87c002
 MISC metadata.xml 317 RMD160 6e56ad407f163d80504468f6fedcfb35fc31db00 SHA1 30b72b0612b1f91712537d24e3a2407eec50e1dd SHA256 1fb093ab05124dcd078fc93a4aa6f787f5829066e100ed98da8ecf65cece63fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0+20oACgkQgAnW8HDreRZX4gCgjqXizXWPKJ7Ue+TcfKxwurgZ
-NtkAoMJefPBsyAFY0fn/RaN7wB3Imz5f
-=9AuN
+iEYEARECAAYFAk1JkdAACgkQgAnW8HDreRbKbQCgoBI6TSUFAcVqGb+ZthIzh8v8
+xpYAmgIhvLQKuOotunUqb8kHezybIkd1
+=QiGp
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110113.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110113.ebuild
deleted file mode 100644
index 5104ba678e62..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110113.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 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_p110113.ebuild,v 1.2 2011/01/17 12:46:51 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-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*})"
-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
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-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
-
-	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${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links
-}
-
-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):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
-
-	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
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110125.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110125.ebuild
deleted file mode 100644
index 98e54f55d31d..000000000000
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110125.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2011 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_p110125.ebuild,v 1.1 2011/01/25 14:16:36 jlec Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.5"
-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*})"
-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
-	opengl? (
-		media-libs/freeglut
-		dev-python/pyglet )"
-# We need to fix this
-#		sci-chemistry/mdd
-DEPEND="${RDEPEND}"
-PDEPEND="
-	extendnmr? (
-		sci-chemistry/aria
-		sci-chemistry/prodecomp )"
-
-RESTRICT="mirror"
-
-S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-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
-
-	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${EPREFIX}/$(python_get_includedir):g" \
-		-e "s:^\(PYTHON_LIB =\).*:\1 $(python_get_library -l):g" \
-		c/environment_default.txt > c/environment.txt
-}
-
-src_compile() {
-	emake -C c all links
-}
-
-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):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
-
-	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
-}
-
-pkg_postinst() {
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	python_mod_cleanup ${PN}
-}
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p110105.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p110202.ebuild
index fd1b7a425796..69a008238996 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p110105.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.5_p110202.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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_p110105.ebuild,v 1.2 2011/01/17 12:46:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p110202.ebuild,v 1.1 2011/02/02 17:18:02 jlec Exp $
 
 EAPI="3"
 
@@ -64,7 +64,7 @@ src_prepare() {
 	if use opengl; then
 		GLUT_NEED_INIT="-DNEED_GLUT_INIT"
 		IGNORE_GL_FLAG=""
-		GL_FLAG="-DUSE_GL_FALSE"
+		GL_FLAG="-DUSE_GL_TRUE"
 		GL_DIR="${EPREFIX}/usr"
 		GL_LIB="-lglut -lGLU -lGL"
 		GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
@@ -102,7 +102,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake -C c all links
+	emake -C c all links || die
 }
 
 src_install() {