diff --git a/dev-lang/python-tk/Manifest b/dev-lang/python-tk/Manifest
index bd696c609..6a6379103 100644
--- a/dev-lang/python-tk/Manifest
+++ b/dev-lang/python-tk/Manifest
@@ -1,10 +1,6 @@
-DIST Python-2.7.2.tar.bz2 11754834 SHA256 5057eb067eb5b5a6040dbd0e889e06550bde9ec041dadaa855ee9490034cbdab
 DIST Python-2.7.3.tar.bz2 11793433 SHA256 726457e11cb153adc3f428aaf1901fc561a374c30e5e7da6742c0742a338663c SHA512 1fc5866b7bdbd3d6b89d92797ea4ad612a3dd6b77c4b9dde9feae64ce6c70013ea1b4d2086dd8e8be426689b4465b1a15d22b048d2f5335de629f5e8b0cb3820 WHIRLPOOL c980f465066ef0881d8b1141c6d8d4c54991c765fc258ddcd37ed2ec483f0686b8cc4cd076c56e0c8fa8891852905bed74d70b3f5071210cef7a9713542ab1a8
-DIST Python-3.2.2.tar.bz2 10743647 SHA256 11426a3c6e4a33e343f100b092049d0a3e09de1c7a2fbf5f0086a8282db59dee
 DIST Python-3.2.3.tar.xz 8970368 SHA256 23c16f621f21e54987079765c060196cbe50235c7867147c6126d433054b1754 SHA512 80a84cc0818b28e0d52828cf23e3618dc25bde5d40dad3d76f1f66d36bdbe14845d6a8582659b304320564ba53cbd5e917f7d435998bbb4c4e2004474d1e7154 WHIRLPOOL 2bdf34a09b12d7b0d7c2df921b74d355eb2ac5dd9d9d979e493f1dba5bbc11034a5b8dfaf11c4210952a56165f8e1d7c0b9badad374fb7ac2236851f93035d0f
 DIST Python-3.3.0.tar.xz 11720732 SHA256 09994d2885a8ef61b4b2389527a9805a4a05e3e0f121dbc8e4222f9010f5bbd7 SHA512 36aacc516d7486c8123656171a9400e3881146464abaa56b8dd1c8e3d0c1c31e305529157eacf6e29e3dd0a065c7ff8452addd1d178578bf8db4c9f5c1b7380f WHIRLPOOL 8da50fd249718d6090da9c75af39fa8e925fa91caf828d8067b7f9697cbe98409635b71f05c337f479499b19783257fc5c89844649d48df60ed24d35b42b68a1
-DIST python-gentoo-patches-2.7.2.tar.bz2 14485 SHA256 29616ce50244c0f7c85b903dcb939d656bfd9d5e8a930d90bff6cf878f3ac5a5
 DIST python-gentoo-patches-2.7.3-1.tar.bz2 13858 SHA256 51f6981ba02064998dfb020725c33233641b3743c4f5cf04091657313a49b8fd SHA512 afccc52ed695d3c99cb20a36d1673c0f5d9abe5e69ed42024a1cc27bb68feeafaff796b8e4e88c7264e5766aadef98d19cf548112e235848d0ca2fa271dc16c7 WHIRLPOOL b8c4e83354f913eb50b9c91ad558a4cc042a395fd4bd7227cc2e5e6ede8962eb699d44ec3b3a05b47ea658fce2e90b2d0e035282d9737d602f313bad1a7d314a
-DIST python-gentoo-patches-3.2.2.tar.bz2 10834 SHA256 521c1bd7c360fb66788e7c5e191497e014bb104f2ef2272d99a40b764082d7cb
 DIST python-gentoo-patches-3.2.3-0.tar.bz2 14265 SHA256 2ad8829aa6594edc405afd0ed148a2b4b608d7c6f09ea90bfb90d87580a4784b SHA512 1ea0c8711ec5952a8c0bafeaceec0d8f8821123fe4f622626b57c6e0b1065c349885537b933a4ef22c29e6c8f6c44f44dec587892a2b13dbfe92ec342f16197d WHIRLPOOL b6f6a4d8e7dcafbf944266d1b5744c71568ddb0c21c5b54c5e041ef8bfd5e1fc5a1e68fa3083d8a466182022a07ebe88d536a4742a5fe0443e5d73d5d4bc64ed
 DIST python-gentoo-patches-3.3.0-1.tar.bz2 11974 SHA256 bb2d066277a3802e6ea18eebddf42134b44cda25b5201b755628d497be28c488 SHA512 e0522c7924e8cf5af3ea42727d277e44691cc11926c77b8fdcdb21687a9ff1b2fa953bfc1b3cd8d3a01c8dea757735b1aadb3b7e0c804068763052316f7e7858 WHIRLPOOL 091b3c2b87e27a68ddba2e2076a20c25aaedc84055c1d336d93ccdc609cd06ab2eea8b17a34008d5eb27e8d9e5677dca8756aa4f06a6cb95329de912e9c06005
diff --git a/dev-lang/python-tk/python-tk-2.7.2-r2.ebuild b/dev-lang/python-tk/python-tk-2.7.2-r2.ebuild
deleted file mode 100644
index dc0662a56..000000000
--- a/dev-lang/python-tk/python-tk-2.7.2-r2.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.2.ebuild,v 1.2 2011/06/27 09:19:45 djc Exp $
-
-EAPI="2"
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils flag-o-matic multilib python toolchain-funcs
-
-if [[ "${PV}" == *_pre* ]]; then
-	inherit mercurial
-
-	EHG_REPO_URI="http://hg.python.org/cpython"
-	EHG_REVISION=""
-else
-	MY_PV="${PV%_p*}"
-	MY_P="Python-${MY_PV}"
-fi
-
-PATCHSET_REVISION="0"
-
-DESCRIPTION="Tk libraries for Python (also provides IDLE)"
-HOMEPAGE="http://www.python.org/"
-if [[ "${PV}" == *_pre* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.bz2
-		mirror://gentoo/python-gentoo-patches-${MY_PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2"
-fi
-
-LICENSE="PSF-2.2"
-SLOT="2.7"
-PYTHON_ABI="${SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipv6 +threads +wide-unicode"
-
-RDEPEND="
-	=dev-lang/python-${PVR}[-tk]
-	ipv6? ( =dev-lang/python-${PVR}[ipv6] )
-	threads? ( =dev-lang/python-${PVR}[threads] )
-	wide-unicode? ( =dev-lang/python-${PVR}[wide-unicode] )
-	>=dev-lang/tk-8.0
-	dev-tcltk/blt"
-DEPEND=">=sys-devel/autoconf-2.65
-	${RDEPEND}
-	$([[ "${PV}" == *_pre* ]] && echo "=${CATEGORY}/${PN}-${PV%%.*}*")
-	dev-util/pkgconfig
-	!sys-devel/gcc[libffi]"
-
-if [[ "${PV}" != *_pre* ]]; then
-	S="${WORKDIR}/${MY_P}"
-fi
-
-pkg_setup() {
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]]; then
-		if [[ "$(hg branch)" != "default" ]]; then
-			die "Invalid EHG_REVISION"
-		fi
-	fi
-
-	if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+_pre ]]; then
-		if [[ "$(hg branch)" != "${SLOT}" ]]; then
-			die "Invalid EHG_REVISION"
-		fi
-
-		if grep -Eq '#define PY_RELEASE_LEVEL[[:space:]]+PY_RELEASE_LEVEL_FINAL' Include/patchlevel.h; then
-			# Update micro version, release level and version string.
-			local micro_version="${PV%_pre*}"
-			micro_version="${micro_version##*.}"
-			local version_string="${PV%.*}.$((${micro_version} - 1))+"
-			sed \
-				-e "s/\(#define PY_MICRO_VERSION[[:space:]]\+\)[^[:space:]]\+/\1${micro_version}/" \
-				-e "s/\(#define PY_RELEASE_LEVEL[[:space:]]\+\)[^[:space:]]\+/\1PY_RELEASE_LEVEL_ALPHA/" \
-				-e "s/\(#define PY_VERSION[[:space:]]\+\"\)[^\"]\+\(\"\)/\1${version_string}\2/" \
-				-i Include/patchlevel.h || die "sed failed"
-		fi
-	fi
-
-	local excluded_patches
-	if ! tc-is-cross-compiler; then
-		excluded_patches="*_all_crosscompile.patch"
-	fi
-
-	local patchset_dir
-	if [[ "${PV}" == *_pre* ]]; then
-		patchset_dir="${FILESDIR}/${SLOT}-${PATCHSET_REVISION}"
-	else
-		patchset_dir="${WORKDIR}/${MY_PV}"
-	fi
-
-	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	eautoreconf
-}
-
-src_configure() {
-	# dbm module can be linked against berkdb or gdbm.
-	# Defaults to gdbm when both are enabled, #204343.
-	local disable
-	disable+=" dbm"
-	disable+=" _bsddb"
-	disable+=" gdbm"
-	disable+=" _curses _curses_panel"
-	disable+=" readline"
-	disable+=" _sqlite3"
-	disable+=" _elementtree pyexpat"
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
-			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
-			Makefile.pre.in || die "sed failed"
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	OPT="" econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-libc="" \
-		--with-system-expat \
-		--with-system-ffi
-}
-
-src_compile() {
-	emake EPYTHON="python${PV%%.*}" || die "emake failed"
-}
-
-src_install() {
-	[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
-
-	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
-	python_clean_installation_image -q
-
-	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}" || die
-	rm -rf "${ED}"etc || die
-
-	local myrelfile=""
-	for myfile in `find "${ED}"usr/ -type f; find "${ED}"usr/ -type l`; do
-		myrelfile="${myfile/${ED}}"
-		case "${myrelfile}" in
-			*lib-tk*)
-				true ;;
-			*_tkinter.so)
-				true ;;
-			*/idlelib/*)
-				true ;;
-			*bin/idle*)
-				true ;;
-			*)
-				rm "${myfile}" || die ;;
-		esac
-	done
-
-	# kill empty dirs from ${ED}
-	local dropped
-	while true; do
-		dropped="0"
-		for mydir in `find "${ED}"usr/ -type d -empty`; do
-			if [ -d "${mydir}" ]; then
-				rmdir "${mydir}" || die
-				dropped="1"
-			fi
-		done
-		[[ "${dropped}" = "0" ]] && break
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_libdir)
-}
diff --git a/dev-lang/python-tk/python-tk-2.7.2-r3.ebuild b/dev-lang/python-tk/python-tk-2.7.2-r3.ebuild
deleted file mode 100644
index dc0662a56..000000000
--- a/dev-lang/python-tk/python-tk-2.7.2-r3.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.2.ebuild,v 1.2 2011/06/27 09:19:45 djc Exp $
-
-EAPI="2"
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils flag-o-matic multilib python toolchain-funcs
-
-if [[ "${PV}" == *_pre* ]]; then
-	inherit mercurial
-
-	EHG_REPO_URI="http://hg.python.org/cpython"
-	EHG_REVISION=""
-else
-	MY_PV="${PV%_p*}"
-	MY_P="Python-${MY_PV}"
-fi
-
-PATCHSET_REVISION="0"
-
-DESCRIPTION="Tk libraries for Python (also provides IDLE)"
-HOMEPAGE="http://www.python.org/"
-if [[ "${PV}" == *_pre* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.bz2
-		mirror://gentoo/python-gentoo-patches-${MY_PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2"
-fi
-
-LICENSE="PSF-2.2"
-SLOT="2.7"
-PYTHON_ABI="${SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipv6 +threads +wide-unicode"
-
-RDEPEND="
-	=dev-lang/python-${PVR}[-tk]
-	ipv6? ( =dev-lang/python-${PVR}[ipv6] )
-	threads? ( =dev-lang/python-${PVR}[threads] )
-	wide-unicode? ( =dev-lang/python-${PVR}[wide-unicode] )
-	>=dev-lang/tk-8.0
-	dev-tcltk/blt"
-DEPEND=">=sys-devel/autoconf-2.65
-	${RDEPEND}
-	$([[ "${PV}" == *_pre* ]] && echo "=${CATEGORY}/${PN}-${PV%%.*}*")
-	dev-util/pkgconfig
-	!sys-devel/gcc[libffi]"
-
-if [[ "${PV}" != *_pre* ]]; then
-	S="${WORKDIR}/${MY_P}"
-fi
-
-pkg_setup() {
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]]; then
-		if [[ "$(hg branch)" != "default" ]]; then
-			die "Invalid EHG_REVISION"
-		fi
-	fi
-
-	if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+_pre ]]; then
-		if [[ "$(hg branch)" != "${SLOT}" ]]; then
-			die "Invalid EHG_REVISION"
-		fi
-
-		if grep -Eq '#define PY_RELEASE_LEVEL[[:space:]]+PY_RELEASE_LEVEL_FINAL' Include/patchlevel.h; then
-			# Update micro version, release level and version string.
-			local micro_version="${PV%_pre*}"
-			micro_version="${micro_version##*.}"
-			local version_string="${PV%.*}.$((${micro_version} - 1))+"
-			sed \
-				-e "s/\(#define PY_MICRO_VERSION[[:space:]]\+\)[^[:space:]]\+/\1${micro_version}/" \
-				-e "s/\(#define PY_RELEASE_LEVEL[[:space:]]\+\)[^[:space:]]\+/\1PY_RELEASE_LEVEL_ALPHA/" \
-				-e "s/\(#define PY_VERSION[[:space:]]\+\"\)[^\"]\+\(\"\)/\1${version_string}\2/" \
-				-i Include/patchlevel.h || die "sed failed"
-		fi
-	fi
-
-	local excluded_patches
-	if ! tc-is-cross-compiler; then
-		excluded_patches="*_all_crosscompile.patch"
-	fi
-
-	local patchset_dir
-	if [[ "${PV}" == *_pre* ]]; then
-		patchset_dir="${FILESDIR}/${SLOT}-${PATCHSET_REVISION}"
-	else
-		patchset_dir="${WORKDIR}/${MY_PV}"
-	fi
-
-	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	eautoreconf
-}
-
-src_configure() {
-	# dbm module can be linked against berkdb or gdbm.
-	# Defaults to gdbm when both are enabled, #204343.
-	local disable
-	disable+=" dbm"
-	disable+=" _bsddb"
-	disable+=" gdbm"
-	disable+=" _curses _curses_panel"
-	disable+=" readline"
-	disable+=" _sqlite3"
-	disable+=" _elementtree pyexpat"
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
-			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
-			Makefile.pre.in || die "sed failed"
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	OPT="" econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-libc="" \
-		--with-system-expat \
-		--with-system-ffi
-}
-
-src_compile() {
-	emake EPYTHON="python${PV%%.*}" || die "emake failed"
-}
-
-src_install() {
-	[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
-
-	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
-	python_clean_installation_image -q
-
-	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}" || die
-	rm -rf "${ED}"etc || die
-
-	local myrelfile=""
-	for myfile in `find "${ED}"usr/ -type f; find "${ED}"usr/ -type l`; do
-		myrelfile="${myfile/${ED}}"
-		case "${myrelfile}" in
-			*lib-tk*)
-				true ;;
-			*_tkinter.so)
-				true ;;
-			*/idlelib/*)
-				true ;;
-			*bin/idle*)
-				true ;;
-			*)
-				rm "${myfile}" || die ;;
-		esac
-	done
-
-	# kill empty dirs from ${ED}
-	local dropped
-	while true; do
-		dropped="0"
-		for mydir in `find "${ED}"usr/ -type d -empty`; do
-			if [ -d "${mydir}" ]; then
-				rmdir "${mydir}" || die
-				dropped="1"
-			fi
-		done
-		[[ "${dropped}" = "0" ]] && break
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_libdir)
-}
diff --git a/dev-lang/python-tk/python-tk-2.7.2.ebuild b/dev-lang/python-tk/python-tk-2.7.2.ebuild
deleted file mode 100644
index dc0662a56..000000000
--- a/dev-lang/python-tk/python-tk-2.7.2.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.2.ebuild,v 1.2 2011/06/27 09:19:45 djc Exp $
-
-EAPI="2"
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils flag-o-matic multilib python toolchain-funcs
-
-if [[ "${PV}" == *_pre* ]]; then
-	inherit mercurial
-
-	EHG_REPO_URI="http://hg.python.org/cpython"
-	EHG_REVISION=""
-else
-	MY_PV="${PV%_p*}"
-	MY_P="Python-${MY_PV}"
-fi
-
-PATCHSET_REVISION="0"
-
-DESCRIPTION="Tk libraries for Python (also provides IDLE)"
-HOMEPAGE="http://www.python.org/"
-if [[ "${PV}" == *_pre* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.bz2
-		mirror://gentoo/python-gentoo-patches-${MY_PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2"
-fi
-
-LICENSE="PSF-2.2"
-SLOT="2.7"
-PYTHON_ABI="${SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipv6 +threads +wide-unicode"
-
-RDEPEND="
-	=dev-lang/python-${PVR}[-tk]
-	ipv6? ( =dev-lang/python-${PVR}[ipv6] )
-	threads? ( =dev-lang/python-${PVR}[threads] )
-	wide-unicode? ( =dev-lang/python-${PVR}[wide-unicode] )
-	>=dev-lang/tk-8.0
-	dev-tcltk/blt"
-DEPEND=">=sys-devel/autoconf-2.65
-	${RDEPEND}
-	$([[ "${PV}" == *_pre* ]] && echo "=${CATEGORY}/${PN}-${PV%%.*}*")
-	dev-util/pkgconfig
-	!sys-devel/gcc[libffi]"
-
-if [[ "${PV}" != *_pre* ]]; then
-	S="${WORKDIR}/${MY_P}"
-fi
-
-pkg_setup() {
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]]; then
-		if [[ "$(hg branch)" != "default" ]]; then
-			die "Invalid EHG_REVISION"
-		fi
-	fi
-
-	if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+_pre ]]; then
-		if [[ "$(hg branch)" != "${SLOT}" ]]; then
-			die "Invalid EHG_REVISION"
-		fi
-
-		if grep -Eq '#define PY_RELEASE_LEVEL[[:space:]]+PY_RELEASE_LEVEL_FINAL' Include/patchlevel.h; then
-			# Update micro version, release level and version string.
-			local micro_version="${PV%_pre*}"
-			micro_version="${micro_version##*.}"
-			local version_string="${PV%.*}.$((${micro_version} - 1))+"
-			sed \
-				-e "s/\(#define PY_MICRO_VERSION[[:space:]]\+\)[^[:space:]]\+/\1${micro_version}/" \
-				-e "s/\(#define PY_RELEASE_LEVEL[[:space:]]\+\)[^[:space:]]\+/\1PY_RELEASE_LEVEL_ALPHA/" \
-				-e "s/\(#define PY_VERSION[[:space:]]\+\"\)[^\"]\+\(\"\)/\1${version_string}\2/" \
-				-i Include/patchlevel.h || die "sed failed"
-		fi
-	fi
-
-	local excluded_patches
-	if ! tc-is-cross-compiler; then
-		excluded_patches="*_all_crosscompile.patch"
-	fi
-
-	local patchset_dir
-	if [[ "${PV}" == *_pre* ]]; then
-		patchset_dir="${FILESDIR}/${SLOT}-${PATCHSET_REVISION}"
-	else
-		patchset_dir="${WORKDIR}/${MY_PV}"
-	fi
-
-	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	eautoreconf
-}
-
-src_configure() {
-	# dbm module can be linked against berkdb or gdbm.
-	# Defaults to gdbm when both are enabled, #204343.
-	local disable
-	disable+=" dbm"
-	disable+=" _bsddb"
-	disable+=" gdbm"
-	disable+=" _curses _curses_panel"
-	disable+=" readline"
-	disable+=" _sqlite3"
-	disable+=" _elementtree pyexpat"
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
-			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
-			Makefile.pre.in || die "sed failed"
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	OPT="" econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-libc="" \
-		--with-system-expat \
-		--with-system-ffi
-}
-
-src_compile() {
-	emake EPYTHON="python${PV%%.*}" || die "emake failed"
-}
-
-src_install() {
-	[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
-
-	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
-	python_clean_installation_image -q
-
-	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}" || die
-	rm -rf "${ED}"etc || die
-
-	local myrelfile=""
-	for myfile in `find "${ED}"usr/ -type f; find "${ED}"usr/ -type l`; do
-		myrelfile="${myfile/${ED}}"
-		case "${myrelfile}" in
-			*lib-tk*)
-				true ;;
-			*_tkinter.so)
-				true ;;
-			*/idlelib/*)
-				true ;;
-			*bin/idle*)
-				true ;;
-			*)
-				rm "${myfile}" || die ;;
-		esac
-	done
-
-	# kill empty dirs from ${ED}
-	local dropped
-	while true; do
-		dropped="0"
-		for mydir in `find "${ED}"usr/ -type d -empty`; do
-			if [ -d "${mydir}" ]; then
-				rmdir "${mydir}" || die
-				dropped="1"
-			fi
-		done
-		[[ "${dropped}" = "0" ]] && break
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_libdir)
-}
diff --git a/dev-lang/python-tk/python-tk-2.7.3-r2.ebuild b/dev-lang/python-tk/python-tk-2.7.3-r2.ebuild
deleted file mode 100644
index 8f3cedc77..000000000
--- a/dev-lang/python-tk/python-tk-2.7.3-r2.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.3-r2.ebuild,v 1.10 2012/07/03 16:24:00 ranger Exp $
-
-EAPI="2"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs
-
-MY_P="Python-${PV}"
-
-PATCHSET_REVISION="1"
-
-DESCRIPTION="Tk libraries for Python (also provides IDLE)"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.bz2
-	mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.bz2"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-PYTHON_ABI="${SLOT}"
-KEYWORDS="amd64 x86"
-IUSE="ipv6 +threads +wide-unicode"
-
-RDEPEND="
-	=dev-lang/python-${PVR}[-tk]
-	ipv6? ( =dev-lang/python-${PVR}[ipv6] )
-	threads? ( =dev-lang/python-${PVR}[threads] )
-	wide-unicode? ( =dev-lang/python-${PVR}[wide-unicode] )
-	>=dev-lang/tk-8.0
-	dev-tcltk/blt"
-DEPEND=">=sys-devel/autoconf-2.65
-	${RDEPEND}
-	$([[ "${PV}" == *_pre* ]] && echo "=${CATEGORY}/${PN}-${PV%%.*}*")
-	dev-util/pkgconfig
-	!sys-devel/gcc[libffi]"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]]; then
-		if [[ "$(hg branch)" != "default" ]]; then
-			die "Invalid EHG_REVISION"
-		fi
-	fi
-
-	if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+_pre ]]; then
-		if [[ "$(hg branch)" != "${SLOT}" ]]; then
-			die "Invalid EHG_REVISION"
-		fi
-
-		if grep -Eq '#define PY_RELEASE_LEVEL[[:space:]]+PY_RELEASE_LEVEL_FINAL' Include/patchlevel.h; then
-			# Update micro version, release level and version string.
-			local micro_version="${PV%_pre*}"
-			micro_version="${micro_version##*.}"
-			local version_string="${PV%.*}.$((${micro_version} - 1))+"
-			sed \
-				-e "s/\(#define PY_MICRO_VERSION[[:space:]]\+\)[^[:space:]]\+/\1${micro_version}/" \
-				-e "s/\(#define PY_RELEASE_LEVEL[[:space:]]\+\)[^[:space:]]\+/\1PY_RELEASE_LEVEL_ALPHA/" \
-				-e "s/\(#define PY_VERSION[[:space:]]\+\"\)[^\"]\+\(\"\)/\1${version_string}\2/" \
-				-i Include/patchlevel.h || die "sed failed"
-		fi
-	fi
-
-	local excluded_patches
-	if ! tc-is-cross-compiler; then
-		excluded_patches="*_all_crosscompile.patch"
-	fi
-
-	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	eautoreconf
-}
-
-src_configure() {
-	# dbm module can be linked against berkdb or gdbm.
-	# Defaults to gdbm when both are enabled, #204343.
-	local disable
-	disable+=" dbm"
-	disable+=" _bsddb"
-	disable+=" gdbm"
-	disable+=" _curses _curses_panel"
-	disable+=" readline"
-	disable+=" _sqlite3"
-	disable+=" _elementtree pyexpat"
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
-			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
-			Makefile.pre.in || die "sed failed"
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	OPT="" econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-libc="" \
-		--with-system-expat \
-		--with-system-ffi
-}
-
-src_compile() {
-	emake EPYTHON="python${PV%%.*}" || die "emake failed"
-}
-
-src_install() {
-	[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
-
-	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
-	python_clean_installation_image -q
-
-	mv "${ED}usr/bin/idle" "${ED}usr/bin/idle${SLOT}" || die
-	rm -rf "${ED}"etc || die
-
-	local myrelfile=""
-	for myfile in `find "${ED}"usr/ -type f; find "${ED}"usr/ -type l`; do
-		myrelfile="${myfile/${ED}}"
-		case "${myrelfile}" in
-			*lib-tk*)
-				true ;;
-			*_tkinter.so)
-				true ;;
-			*/idlelib/*)
-				true ;;
-			*bin/idle*)
-				true ;;
-			*)
-				rm "${myfile}" || die ;;
-		esac
-	done
-
-	# kill empty dirs from ${ED}
-	local dropped
-	while true; do
-		dropped="0"
-		for mydir in `find "${ED}"usr/ -type d -empty`; do
-			if [ -d "${mydir}" ]; then
-				rmdir "${mydir}" || die
-				dropped="1"
-			fi
-		done
-		[[ "${dropped}" = "0" ]] && break
-	done
-}
-
-pkg_postinst() {
-	python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
-}
-
-pkg_postrm() {
-	python_mod_cleanup $(python_get_libdir)
-}
diff --git a/dev-lang/python-tk/python-tk-2.7.3-r3.ebuild b/dev-lang/python-tk/python-tk-2.7.3-r3.ebuild
index 1db398292..1b07d98de 100644
--- a/dev-lang/python-tk/python-tk-2.7.3-r3.ebuild
+++ b/dev-lang/python-tk/python-tk-2.7.3-r3.ebuild
@@ -78,35 +78,9 @@ src_prepare() {
 }
 
 src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		# dbm module can be linked against berkdb or gdbm.
-		# Defaults to gdbm when both are enabled, #204343.
-		local disable
-		use berkdb   || use gdbm || disable+=" dbm"
-		use berkdb   || disable+=" _bsddb"
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
+	# Disable extraneous modules with extra dependencies.
+	export PYTHON_DISABLE_MODULES="dbm _bsddb gdbm _curses _curses_panel readline _sqlite3 _elementtree pyexpat"
+	export PYTHON_DISABLE_SSL="1"
 
 	if [[ "$(gcc-major-version)" -ge 4 ]]; then
 		append-flags -fwrapv
@@ -150,14 +124,6 @@ src_configure() {
 	# Please query BSD team before removing this!
 	append-ldflags "-L."
 
-	local dbmliborder
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-	if use berkdb; then
-		dbmliborder+="${dbmliborder:+:}bdb"
-	fi
-
 	OPT="" econf \
 		--with-fpectl \
 		--enable-shared \
@@ -224,4 +190,8 @@ src_install() {
 		done
 		[[ "${dropped}" = "0" ]] && break
 	done
+
+	# QA check that we have _tkinter.so
+	local found=$(find "${ED}" -name "_tkinter.so")
+	[ -z "${found}" ] && die "_tkinter.so not installed"
 }
diff --git a/dev-lang/python-tk/python-tk-3.2.2.ebuild b/dev-lang/python-tk/python-tk-3.2.2.ebuild
deleted file mode 100644
index 45a91907e..000000000
--- a/dev-lang/python-tk/python-tk-3.2.2.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.7.2.ebuild,v 1.2 2011/06/27 09:19:45 djc Exp $
-
-EAPI="2"
-WANT_AUTOMAKE="none"
-
-inherit autotools eutils flag-o-matic multilib python toolchain-funcs
-
-if [[ "${PV}" == *_pre* ]]; then
-	inherit mercurial
-
-	EHG_REPO_URI="http://hg.python.org/cpython"
-	EHG_REVISION=""
-else
-	MY_PV="${PV%_p*}"
-	MY_P="Python-${MY_PV}"
-fi
-
-PATCHSET_REVISION="0"
-
-DESCRIPTION="Tk libraries for Python (also provides IDLE)"
-HOMEPAGE="http://www.python.org/"
-if [[ "${PV}" == *_pre* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="http://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.bz2
-		mirror://gentoo/python-gentoo-patches-${MY_PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2"
-fi
-
-LICENSE="PSF-2.2"
-SLOT="3.2"
-PYTHON_ABI="${SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipv6 +threads +wide-unicode"
-
-RDEPEND="
-	=dev-lang/python-${PVR}[-tk]
-	ipv6? ( =dev-lang/python-${PVR}[ipv6] )
-	threads? ( =dev-lang/python-${PVR}[threads] )
-	wide-unicode? ( =dev-lang/python-${PVR}[wide-unicode] )
-	>=dev-lang/tk-8.0
-	dev-tcltk/blt"
-DEPEND=">=sys-devel/autoconf-2.65
-	${RDEPEND}
-	$([[ "${PV}" == *_pre* ]] && echo "=${CATEGORY}/${PN}-${PV%%.*}*")
-	dev-util/pkgconfig
-	!sys-devel/gcc[libffi]"
-
-if [[ "${PV}" != *_pre* ]]; then
-	S="${WORKDIR}/${MY_P}"
-fi
-
-pkg_setup() {
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]]; then
-		if [[ "$(hg branch)" != "default" ]]; then
-			die "Invalid EHG_REVISION"
-		fi
-	fi
-
-	if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+_pre ]]; then
-		if [[ "$(hg branch)" != "${SLOT}" ]]; then
-			die "Invalid EHG_REVISION"
-		fi
-
-		if grep -Eq '#define PY_RELEASE_LEVEL[[:space:]]+PY_RELEASE_LEVEL_FINAL' Include/patchlevel.h; then
-			# Update micro version, release level and version string.
-			local micro_version="${PV%_pre*}"
-			micro_version="${micro_version##*.}"
-			local version_string="${PV%.*}.$((${micro_version} - 1))+"
-			sed \
-				-e "s/\(#define PY_MICRO_VERSION[[:space:]]\+\)[^[:space:]]\+/\1${micro_version}/" \
-				-e "s/\(#define PY_RELEASE_LEVEL[[:space:]]\+\)[^[:space:]]\+/\1PY_RELEASE_LEVEL_ALPHA/" \
-				-e "s/\(#define PY_VERSION[[:space:]]\+\"\)[^\"]\+\(\"\)/\1${version_string}\2/" \
-				-i Include/patchlevel.h || die "sed failed"
-		fi
-	fi
-
-	local excluded_patches
-	if ! tc-is-cross-compiler; then
-		excluded_patches="*_all_crosscompile.patch"
-	fi
-
-	local patchset_dir
-	if [[ "${PV}" == *_pre* ]]; then
-		patchset_dir="${FILESDIR}/${SLOT}-${PATCHSET_REVISION}"
-	else
-		patchset_dir="${WORKDIR}/${MY_PV}"
-	fi
-
-	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	eautoreconf
-}
-
-src_configure() {
-	# dbm module can be linked against berkdb or gdbm.
-	# Defaults to gdbm when both are enabled, #204343.
-	local disable
-	disable+=" dbm"
-	disable+=" _bsddb"
-	disable+=" gdbm"
-	disable+=" _curses _curses_panel"
-	disable+=" readline"
-	disable+=" _sqlite3"
-	disable+=" _elementtree pyexpat"
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
-			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
-			Makefile.pre.in || die "sed failed"
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	OPT="" econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-libc="" \
-		--with-system-expat \
-		--with-system-ffi
-}
-
-src_compile() {
-	emake EPYTHON="python${PV%%.*}" || die "emake failed"
-}
-
-src_install() {
-	[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
-
-	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
-	python_clean_installation_image -q
-
-	rm -rf "${ED}"etc || die
-
-	local myrelfile=""
-	for myfile in `find "${ED}"usr/ -type f; find "${ED}"usr/ -type l`; do
-		myrelfile="${myfile/${ED}}"
-		case "${myrelfile}" in
-			*lib-tk*)
-				true ;;
-			*_tkinter*.so)
-				true ;;
-			*/idlelib/*)
-				true ;;
-			*bin/idle*)
-				true ;;
-			*)
-				rm "${myfile}" || die ;;
-		esac
-	done
-
-	# kill empty dirs from ${ED}
-	local dropped
-	while true; do
-		dropped="0"
-		for mydir in `find "${ED}"usr/ -type d -empty`; do
-			if [ -d "${mydir}" ]; then
-				rmdir "${mydir}" || die
-				dropped="1"
-			fi
-		done
-		[[ "${dropped}" = "0" ]] && break
-	done
-}
-
-pkg_postinst() {
-	:;
-}
-
-pkg_postrm() {
-	:;
-}
diff --git a/dev-lang/python-tk/python-tk-3.2.3-r1.ebuild b/dev-lang/python-tk/python-tk-3.2.3-r1.ebuild
deleted file mode 100644
index 025e86eb8..000000000
--- a/dev-lang/python-tk/python-tk-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-WANT_AUTOMAKE="none"
-WANT_LIBTOOL="none"
-
-inherit autotools eutils flag-o-matic multilib pax-utils python toolchain-funcs
-
-MY_P="Python-${PV}"
-PATCHSET_REVISION="0"
-
-DESCRIPTION="Tk libraries for Python (also provides IDLE)"
-HOMEPAGE="http://www.python.org/"
-SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
-	mirror://gentoo/python-gentoo-patches-${PV}-${PATCHSET_REVISION}.tar.bz2"
-
-LICENSE="PSF-2.2"
-SLOT="3.2"
-PYTHON_ABI="${SLOT}"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipv6 +threads +wide-unicode"
-
-RDEPEND="
-	=dev-lang/python-${PVR}[-tk]
-	ipv6? ( =dev-lang/python-${PVR}[ipv6] )
-	threads? ( =dev-lang/python-${PVR}[threads] )
-	wide-unicode? ( =dev-lang/python-${PVR}[wide-unicode] )
-	>=dev-lang/tk-8.0
-	dev-tcltk/blt"
-DEPEND=">=sys-devel/autoconf-2.65
-	${RDEPEND}
-	$([[ "${PV}" == *_pre* ]] && echo "=${CATEGORY}/${PN}-${PV%%.*}*")
-	dev-util/pkgconfig
-	!sys-devel/gcc[libffi]"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python_pkg_setup
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat, libffi and zlib are not used.
-	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
-	rm -fr Modules/zlib
-
-	local excluded_patches
-	if ! tc-is-cross-compiler; then
-		excluded_patches="*_all_crosscompile.patch"
-	fi
-
-	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/${PV}-${PATCHSET_REVISION}"
-
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
-		Lib/distutils/command/install.py \
-		Lib/distutils/sysconfig.py \
-		Lib/site.py \
-		Lib/sysconfig.py \
-		Lib/test/test_site.py \
-		Makefile.pre.in \
-		Modules/Setup.dist \
-		Modules/getpath.c \
-		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
-
-	eautoreconf
-}
-
-src_configure() {
-	# dbm module can be linked against berkdb or gdbm.
-	# Defaults to gdbm when both are enabled, #204343.
-	local disable
-	disable+=" dbm"
-	disable+=" _bsddb"
-	disable+=" gdbm"
-	disable+=" _curses _curses_panel"
-	disable+=" readline"
-	disable+=" _sqlite3"
-	disable+=" _elementtree pyexpat"
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	if [[ "$(gcc-major-version)" -ge 4 ]]; then
-		append-flags -fwrapv
-	fi
-
-	filter-flags -malign-double
-
-	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=50309
-	if is-flagq -O3; then
-		is-flagq -fstack-protector-all && replace-flags -O3 -O2
-		use hardened && replace-flags -O3 -O2
-	fi
-
-	if tc-is-cross-compiler; then
-		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
-		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
-		emake python Parser/pgen || die "cross-make failed"
-		mv python hostpython
-		mv Parser/pgen Parser/hostpgen
-		make distclean
-		sed -i \
-			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
-			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
-			Makefile.pre.in || die "sed failed"
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python2.X/config/Makefile.
-	tc-export CXX
-
-	# Set LDFLAGS so we link modules with -lpython2.7 correctly.
-	# Needed on FreeBSD unless Python 2.7 is already installed.
-	# Please query BSD team before removing this!
-	append-ldflags "-L."
-
-	OPT="" econf \
-		--with-fpectl \
-		--enable-shared \
-		$(use_enable ipv6) \
-		$(use_with threads) \
-		$(use wide-unicode && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
-		--infodir='${prefix}/share/info' \
-		--mandir='${prefix}/share/man' \
-		--with-libc="" \
-		--with-system-expat \
-		--with-system-ffi
-}
-
-src_compile() {
-	emake CPPFLAGS="" CFLAGS="" LDFLAGS="" || die "emake failed"
-
-	# Work around bug 329499. See also bug 413751.
-	pax-mark m python
-}
-
-src_install() {
-	[[ -z "${ED}" ]] && ED="${D%/}${EPREFIX}/"
-
-	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
-	python_clean_installation_image -q
-
-	rm -rf "${ED}"etc || die
-
-	local myrelfile=""
-	for myfile in `find "${ED}"usr/ -type f; find "${ED}"usr/ -type l`; do
-		myrelfile="${myfile/${ED}}"
-		case "${myrelfile}" in
-			*lib-tk*)
-				true ;;
-			*_tkinter*.so)
-				true ;;
-			*/idlelib/*)
-				true ;;
-			*bin/idle*)
-				true ;;
-			*)
-				rm "${myfile}" || die ;;
-		esac
-	done
-
-	# kill empty dirs from ${ED}
-	local dropped
-	while true; do
-		dropped="0"
-		for mydir in `find "${ED}"usr/ -type d -empty`; do
-			if [ -d "${mydir}" ]; then
-				rmdir "${mydir}" || die
-				dropped="1"
-			fi
-		done
-		[[ "${dropped}" = "0" ]] && break
-	done
-}
-
-pkg_postinst() {
-	:;
-}
-
-pkg_postrm() {
-	:;
-}
diff --git a/dev-lang/python-tk/python-tk-3.2.3-r2.ebuild b/dev-lang/python-tk/python-tk-3.2.3-r2.ebuild
index 1a448fbd1..0f50568c9 100644
--- a/dev-lang/python-tk/python-tk-3.2.3-r2.ebuild
+++ b/dev-lang/python-tk/python-tk-3.2.3-r2.ebuild
@@ -75,31 +75,9 @@ src_prepare() {
 }
 
 src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		local disable
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
+	# Disable extraneous modules with extra dependencies.
+	export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _elementtree pyexpat"
+	export PYTHON_DISABLE_SSL="1"
 
 	if [[ "$(gcc-major-version)" -ge 4 ]]; then
 		append-flags -fwrapv
@@ -210,4 +188,8 @@ src_install() {
 		done
 		[[ "${dropped}" = "0" ]] && break
 	done
+
+	# QA check that we have _tkinter.so
+	local found=$(find "${ED}" -name "_tkinter.so")
+	[ -z "${found}" ] && die "_tkinter.so not installed"
 }
diff --git a/dev-lang/python-tk/python-tk-3.3.0-r1.ebuild b/dev-lang/python-tk/python-tk-3.3.0-r1.ebuild
index 2ee820bbc..222e23632 100644
--- a/dev-lang/python-tk/python-tk-3.3.0-r1.ebuild
+++ b/dev-lang/python-tk/python-tk-3.3.0-r1.ebuild
@@ -65,31 +65,9 @@ src_prepare() {
 }
 
 src_configure() {
-	if use build; then
-		# Disable extraneous modules with extra dependencies.
-		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
-		export PYTHON_DISABLE_SSL="1"
-	else
-		local disable
-		use gdbm     || disable+=" gdbm"
-		use ncurses  || disable+=" _curses _curses_panel"
-		use readline || disable+=" readline"
-		use sqlite   || disable+=" _sqlite3"
-		use ssl      || export PYTHON_DISABLE_SSL="1"
-		use tk       || disable+=" _tkinter"
-		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-		export PYTHON_DISABLE_MODULES="${disable}"
-
-		if ! use xml; then
-			ewarn "You have configured Python without XML support."
-			ewarn "This is NOT a recommended configuration as you"
-			ewarn "may face problems parsing any XML documents."
-		fi
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
+	# Disable extraneous modules with extra dependencies.
+	export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _elementtree pyexpat"
+	export PYTHON_DISABLE_SSL="1"
 
 	if [[ "$(gcc-major-version)" -ge 4 ]]; then
 		append-flags -fwrapv
@@ -199,4 +177,8 @@ src_install() {
 		done
 		[[ "${dropped}" = "0" ]] && break
 	done
+
+	# QA check that we have _tkinter.so
+	local found=$(find "${ED}" -name "_tkinter.so")
+	[ -z "${found}" ] && die "_tkinter.so not installed"
 }