--- /var/lib/layman/science/sci-chemistry/modeller/modeller-9.8.ebuild	2011-05-08 00:54:20.932000010 +0200
+++ modeller-9.9.ebuild	2011-05-27 20:59:12.687000078 +0200
@@ -6,13 +6,12 @@
 
 PYTHON_DEPEND="2:2.6"
 
-inherit distutils eutils versionator
+inherit distutils eutils 
 
-MY_PV="$(replace_all_version_separators v)"
-MY_P="${PN}-${MY_PV}"
+MY_P="${PN}-${PV}"
 
 DESCRIPTION="Homology or comparative modeling of protein three-dimensional structures"
-SRC_URI="http://salilab.org/${PN}/${MY_PV}/${PN}-${MY_PV}.tar.gz"
+SRC_URI="http://salilab.org/${PN}/${PV}/${PN}-${PV}.tar.gz"
 HOMEPAGE="http://salilab.org/modeller/"
 
 LICENSE="modeller"
@@ -59,9 +58,9 @@
 
 src_install(){
 	sed \
-		-e "s:EXECUTABLE_TYPE${MY_PV}=xxx:EXECUTABLE_TYPE${MY_PV}=${EXECTYPE}:g" \
-		-e "s:MODINSTALL${MY_PV}=xxx:MODINSTALL${MY_PV}=\"${INPATH}\":g" \
-		bin/modscript > "${T}/mod${MY_PV}"
+		-e "s:EXECUTABLE_TYPE${PV}=xxx:EXECUTABLE_TYPE${PV}=${EXECTYPE}:g" \
+		-e "s:MODINSTALL${PV}=xxx:MODINSTALL${PV}=\"${INPATH}\":g" \
+		bin/modscript > "${T}/mod${PV}"
 
 	sed -e "s;@TOPDIR\@;\"${INPATH}\";" \
 		-e "s;@EXETYPE\@;${EXECTYPE};" \
@@ -73,10 +72,10 @@
 	insinto ${INPATH}/bin
 	doins -r bin/{lib,*top} || die
 	exeinto ${INPATH}/bin
-	doexe bin/{modslave.py,mod${MY_PV}_${EXECTYPE}} || die
-	doexe "${T}/mod${MY_PV}" || die
+	doexe bin/{modslave.py,mod${PV}_${EXECTYPE}} || die
+	doexe "${T}/mod${PV}" || die
 	doexe "${T}/modpy.sh" || die
-	dosym ${INPATH}/bin/mod${MY_PV} /opt/bin/mod${MY_PV} || die
+	dosym ${INPATH}/bin/mod${PV} /opt/bin/mod${PV} || die
 	dosym ${INPATH}/bin/modpy.sh /opt/bin/modpy.sh || die
 
 	exeinto ${INPATH}/lib/${EXECTYPE}/