--- file_not_specified_in_diff	
+++ file_not_specified_in_diff	
@@ -, +, @@ 
--- mpich2-1.0.8.ebuild
+++ mpich2-1.0.8.ebuild
@@ -49,7 +49,6 @@ 
 	fi
 
 	MPD_CONF_FILE_DIR=/etc/${PN}
-	python_version
 }
 
 src_unpack() {
@@ -201,7 +200,7 @@ 
 	sed -i "s,@MPD_CONF_FILE_DIR@,${MPD_CONF_FILE_DIR}," \
 		"${T}"/${PN}.envd
 
-	ln -s ../$(get_libdir)/python${PYVER}/site-packages/mpich2/mpdgdbdrv.py \
+	ln -s ../$(get_libdir)/python$(python_get_version)/site-packages/mpich2/mpdgdbdrv.py \
 		"${D}"/usr/bin/mpdgdbdrv.py
 	newenvd "${FILESDIR}"/${PN}.envd 25mpich2
 }
@@ -211,7 +210,7 @@ 
 	chown root:root "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
 	chmod 600 "${ROOT}"${MPD_CONF_FILE_DIR}/mpd.conf
 
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+	python_mod_optimize $(python_get_sitedir)/${PN}
 	elog ""
 	elog "MPE2 has been removed from this ebuild and now stands alone"
 	elog "as sys-cluster/mpe2."
@@ -219,5 +218,5 @@ 
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+	python_mod_cleanup $(python_get_sitedir)/${PN}
 }