--- ccpnmr-1.0.15.ebuild	2008-03-25 10:33:40.000000000 +0100
+++ ccpnmr-1.0.15-r2.ebuild	2008-05-08 09:28:55.000000000 +0200
@@ -18,6 +18,8 @@
 		  virtual/glut
 		  dev-tcltk/tix"
 
+S="${WORKDIR}/${PN}"
+
 pkg_setup(){
 	if ! built_with_use dev-lang/python tk; then
 	eerror "Please reemerge dev-lang/python with 'tk' support or ccpnmr will"
@@ -40,7 +42,7 @@
 src_compile(){
 	tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
 	python_version
-	cd ccpnmr/ccpnmr1.0/c
+	cd ccpnmr1.0/c
 
 	cat >> environment.txt <<- EOF
 	CC = $(tc-getCC)
@@ -75,46 +77,50 @@
 	CFLAGS = $CFLAGS \$(MALLOC_FLAG) \$(FPIC_FLAG) \$(XOR_FLAG)
 	EOF
 
-	emake
-	emake links
+	emake || die
+	emake links || die
 }
 
 src_install(){
 
 	IN_PATH=/usr/$(get_libdir)/python${PYVER}/site-packages/ccpnmr
+	
+	cat >> "${T}"/20ccpnmr <<- EOF
+	CCPNMR_TOP_DIR=${IN_PATH}
+	PYTHONPATH=${IN_PATH}/ccpnmr1.0/python
+	LD_LIBRARY_PATH=/usr/$(get_libdir)
+	TCL_LIBRARY=/usr/$(get_libdir)/tcl$tk_ver
+	TK_LIBRARY=/usr/$(get_libdir)/tk$tk_ver
+	EOF
+
+	doenvd "${T}"/20ccpnmr
 
 	einfo "Creating launch wrapper"
 
-	cat >> "${T}"/base <<- EOF
-	#!/bin/sh
-	export CCPNMR_TOP_DIR=${IN_PATH}
-	export PYTHONPATH=${IN_PATH}/ccpnmr1.0/python
-	export LD_LIBRARY_PATH=/usr/$(get_libdir)
-	export TCL_LIBRARY=/usr/$(get_libdir)/tcl$tk_ver
-	export TK_LIBRARY=/usr/$(get_libdir)/tk$tk_ver
+	cat >> "${T}"/analysis <<- EOF
+	${python} -O -i \${CCPNMR_TOP_DIR}/ccpnmr1.0/python/ccpnmr/analysis/AnalysisGui.py \$1 \$2 \$3 \$4 \$5
 	EOF
 
-	insinto /usr/share/${PF}/
-	newins "${T}"/base ccpnmr-base
-
-	echo "source /usr/share/${PF}/ccpnmr-base" > "${T}"/analysis
-	echo "${python} -O -i \${CCPNMR_TOP_DIR}/ccpnmr1.0/python/ccpnmr/analysis/AnalysisGui.py \$1 \$2 \$3 \$4 \$5" >> "${T}"/analysis
-
-	echo "source /usr/share/${PF}/ccpnmr-base" > "${T}"/dataShifter
-	echo "${python} -O \${PYTHONPATH}/ccpnmr/format/gui/DataShifter.py" >> "${T}"/dataShifter
+	cat >> "${T}"/dataShifter <<- EOF
+	${python} -O \${PYTHONPATH}/ccpnmr/format/gui/DataShifter.py
+	EOF
 
-	echo "source /usr/share/${PF}/ccpnmr-base" > "${T}"/formatConverter
-	echo "${python} -O \${PYTHONPATH}/ccpnmr/format/gui/FormatConverter.py \$1 \$2" >> "${T}"/formatConverter
+	cat >> "${T}"/formatConverter <<- EOF
+	${python} -O \${PYTHONPATH}/ccpnmr/format/gui/FormatConverter.py \$1 \$2
+	EOF
 
-	echo "source /usr/share/${PF}/ccpnmr-base" > "${T}"/pipe2azara
-	echo "${python} -O \${PYTHONPATH}/ccpnmr/analysis/NmrPipeData.py \$1 \$2 \$3" >> "${T}"/pipe2azara
+	cat >> "${T}"/pipe2azara <<- EOF
+	${python} -O \${PYTHONPATH}/ccpnmr/analysis/NmrPipeData.py \$1 \$2 \$3
+	EOF
 
 #Perhaps the two update wrapper shouldn't be.
-	echo "source /usr/share/${PF}/ccpnmr-base" > "${T}"/updateAll
-	echo "${python} -O \${PYTHONPATH}/ccpnmr/update/UpdateAuto.py" >> "${T}"/updateAll
+	cat >> "${T}"/updateAll <<- EOF
+	${python} -O \${PYTHONPATH}/ccpnmr/update/UpdateAuto.py
+	EOF
 
-	echo "source /usr/share/${PF}/ccpnmr-base" > "${T}"/updateCheck
-	echo "${python} -O \${PYTHONPATH}/ccpnmr/update/UpdatePopup.py" >> "${T}"/updateCheck
+	cat >> "${T}"/updateCheck <<- EOF
+	${python} -O \${PYTHONPATH}/ccpnmr/update/UpdatePopup.py
+	EOF
 
 	einfo "Installing wrapper"
 	exeinto ${IN_PATH}/bin
@@ -131,15 +137,14 @@
 		done
 
 	insinto ${IN_PATH}
-	cd ccpnmr
 
 	einfo "Installing main files"
 	insopts -v
-	doins -r *
+	doins -r * || die "main files installation failed"
 
 
 	einfo "Adjusting permissions"
-#I do not know wether this is a must or not, but thats how the original install looks like
+
 	local FILES="c/ccp/structure/StructUtil.so
 				 c/ccp/structure/StructAtom.so
 				 c/ccp/structure/StructBond.so
@@ -184,10 +189,14 @@
 		einfo "Installing example files"
 		insopts -v
 		insinto /usr/share/${PF}/
-		doins -r analysisTutorialData
+		doins -r analysisTutorialData || die "tutorial data installation failed"
 	fi
 }
 
+pkg_postinst(){
+	python_mod_optimize "${ROOT%/}"/usr/$(get_libdir)/python${PYVER}/site-packages/ccpnmr
+}
+
 pkg_postrm() {
-	python_mod_cleanup "${ROOT}"/usr/$(get_libdir)/python${PYVER}/site-packages/ccpnmr
+	python_mod_cleanup "${ROOT%/}"/usr/$(get_libdir)/python${PYVER}/site-packages/ccpnmr
 }
\ No newline at end of file