diff --git a/usr/portage/app-text/txt2tags/txt2tags-2.3-r1.ebuild b/app-text/txt2tags/txt2tags-2.3-r1.ebuild
index 47ff101..175b82a 100644
--- a/usr/portage/app-text/txt2tags/txt2tags-2.3-r1.ebuild
+++ b/app-text/txt2tags/txt2tags-2.3-r1.ebuild
@@ -2,7 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-text/txt2tags/txt2tags-2.3-r1.ebuild,v 1.6 2007/09/28 14:37:59 angelos Exp $
 
-inherit elisp-common
+EAPI="2"
+PYTHON_USE_WITH="tk"
+PYTHON_USE_WITH_OPT="tk"
+PYTHON_DEPEND="2"
+
+inherit elisp-common python
 
 DESCRIPTION="A tool for generating marked up documents (HTML, SGML, ...) from a plain text file with markup"
 HOMEPAGE="http://txt2tags.sourceforge.net/"
@@ -13,24 +18,18 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="emacs tk"
 
-DEPEND="virtual/python
-	tk? ( dev-lang/tk )
+DEPEND="tk? ( dev-lang/tk )
 	emacs? ( virtual/emacs )"
 
 SITEFILE="51${PN}-gentoo.el"
 
 pkg_setup() {
-	# need to test if the tk support in python is working
-	if use tk; then
-		if ! python -c "import _tkinter" 2>&1 > /dev/null ; then
-			echo
-			eerror "You have requested tk, but your build of Python"
-			eerror "doesnt support import _tkinter. You may need to"
-			eerror "remerge dev-lang/python, or build ${P}"
-			eerror "with USE=\"-tk\""
-			die
-		fi
-	fi
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
 }
 
 src_compile() {