--- ecasound-2.6.0.ebuild
+++ ecasound-2.6.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/media-sound/ecasound/ecasound-2.6.0.ebuild,v 1.6 2009/08/01 06:24:06 ssuominen Exp $
 
-EAPI=2
+EAPI=3
 
-inherit eutils multilib python
+inherit eutils python
 
 DESCRIPTION="a package for multitrack audio processing"
 HOMEPAGE="http://ecasound.seul.org/ecasound"
@@ -34,10 +34,9 @@
 	local PYConf
 
 	if use python; then
-		python_version
 		PYConf="--enable-pyecasound=c
-			--with-python-includes=/usr/include/python${PYVER}
-			--with-python-modules=/usr/$(get_libdir)/python${PYVER}"
+			--with-python-includes=$(python_get_includedir)
+			--with-python-modules=$(python_get_libdir)"
 	else
 		PYConf="$myconf --disable-pyecasound"
 	fi
@@ -67,16 +66,12 @@
 
 pkg_postinst() {
 	if use python; then
-		ebegin "Byte-compiling ${CATEGORY}/${PF} python modules"
-		python_version
-		local PYMODULE
-		for PYMODULE in ecacontrol.py pyeca.py eci.py; do
-			python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/${PYMODULE}
-		done
-		eend $?
+		python_mod_optimize ecacontrol.py eci.py pyeca.py
 	fi
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	if use python; then
+		python_mod_cleanup ecacontrol.py eci.py pyeca.py
+	fi
 }