--- /mnt/gen2/old-portage/dev-python/translate-toolkit/translate-toolkit-1.10.0.ebuild	2013-05-20 17:01:13.000000000 +0800
+++ translate-toolkit-1.11.0.ebuild	2014-03-20 13:41:00.229988564 +0800
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-python/translate-toolkit/translate-toolkit-1.10.0.ebuild,v 1.3 2013/05/20 08:43:05 ago Exp $
 
-EAPI=3
+EAPI=5
 
-PYTHON_USE_WITH="sqlite"
-PYTHON_DEPEND="2:2.6"
-PYTHON_MODNAME=translate
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_{6,7} )
 
-inherit distutils python
+inherit distutils-r1
 
 DESCRIPTION="Toolkit to convert between many translation formats"
 HOMEPAGE="http://translate.sourceforge.net"
@@ -16,54 +15,48 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc +html +ical +ini +subtitles"
 
-RDEPEND="
-	app-text/iso-codes
-	dev-python/lxml
-	dev-python/python-levenshtein
+RDEPEND="app-text/iso-codes
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/python-levenshtein-0.10.2[${PYTHON_USEDEP}]
 	sys-devel/gettext
-	html? ( dev-python/utidylib )
-	ical? ( dev-python/vobject )
-	ini? ( dev-python/iniparse )
-	dev-python/sphinx
-"
+	>=dev-python/sphinx-1.1[${PYTHON_USEDEP}]
+	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
+	ical? ( >=dev-python/vobject-0.6.6[${PYTHON_USEDEP}] )
+	ini? ( >=dev-python/iniparse-0.3.1[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/mapping.patch )
 
-src_compile() {
-	distutils_src_compile
-	use doc && { cd docs && make html || die "Failed to generate documentation" ; }
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
 }
 
 src_install() {
 	local filename binary
-
-	dodoc README.rst || die
-	use doc && { dohtml -r docs/_build/html/* || die ; }
-	rm -Rf docs || die
-
-	distutils_src_install
+	distutils-r1_src_install
 
 	if ! use html; then
-		rm "${ED}"/usr/bin/html2po || die
-		rm "${ED}"/usr/bin/po2html || die
+		rm "${D}"/usr/bin/{html2po,po2html} || die
 	fi
 	if ! use ical; then
-		rm "${ED}"/usr/bin/ical2po || die
-		rm "${ED}"/usr/bin/po2ical || die
+		rm "${D}"/usr/bin/{ical2po,po2ical} || die
 	fi
 	if ! use ini; then
-		rm "${ED}"/usr/bin/ini2po || die
-		rm "${ED}"/usr/bin/po2ini || die
+		rm "${D}"/usr/bin/{ini2po,po2ini} || die
 	fi
 	if ! use subtitles; then
-		rm "${ED}"/usr/bin/sub2po || die
-		rm "${ED}"/usr/bin/po2sub || die
+		rm "${D}"/usr/bin/{sub2po,po2sub} || die
 	fi
 
 	einfo "Generating man pages..."
-	for binary in "${ED}"/usr/bin/*; do
+	for binary in "${D}"/usr/bin/*; do
 		filename=$(basename "${binary}")
 		PYTHONPATH=${WORKDIR}/${PF}:${PYTHONPATH}
 


# mapping.patch.  This appparently lacks support from some.  
# These invoke a d'loaded at the start of a doc build.
diff -ur translate-toolkit-1.11.0.orig/docs/conf.py translate-toolkit-1.11.0/docs/conf.py
--- translate-toolkit-1.11.0.orig/docs/conf.py	2014-01-31 19:05:10.000000000 +0800
+++ translate-toolkit-1.11.0/docs/conf.py	2014-03-20 11:52:59.928081015 +0800
@@ -317,14 +317,14 @@
 
 # -- Options for Intersphinx -------------------------------------------------
 
-intersphinx_mapping = {
-    'python': ('http://docs.python.org/2.7', None),
-    'pytest': ('http://pytest.org/latest/', None),
-    'django': ('http://django.readthedocs.org/en/latest/', None),
-    'pootle': ('http://docs.translatehouse.org/projects/pootle/en/latest/', None),
-    'virtaal': ('http://docs.translatehouse.org/projects/virtaal/en/latest/', None),
-    'guide': ('http://docs.translatehouse.org/projects/localization-guide/en/latest/', None),
-}
+#intersphinx_mapping = {
+#    'python': ('http://docs.python.org/2.7', None),
+#    'pytest': ('http://pytest.org/latest/', None),
+#    'django': ('http://django.readthedocs.org/en/latest/', None),
+#    'pootle': ('http://docs.translatehouse.org/projects/pootle/en/latest/', None),
+#    'virtaal': ('http://docs.translatehouse.org/projects/virtaal/en/latest/', None),
+#    'guide': ('http://docs.translatehouse.org/projects/localization-guide/en/latest/', None),
+#}
 
 
 # -- Options for Exernal links -------------------------------------------------