Add missing setuptools dep, QA fixes, drop old.

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!)

4 files changed, 10 insertions, 97 deletions

diff --git a/dev-python/python-levenshtein/ChangeLog b/dev-python/python-levenshtein/ChangeLog
index 169982c7488c..9c166f38c151 100644
--- a/dev-python/python-levenshtein/ChangeLog
+++ b/dev-python/python-levenshtein/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/python-levenshtein
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-levenshtein/ChangeLog,v 1.16 2013/05/22 10:36:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-levenshtein/ChangeLog,v 1.17 2013/08/14 13:18:24 mgorny Exp $
+
+  14 Aug 2013; Michał Górny <mgorny@gentoo.org>
+  -python-levenshtein-0.10.2.ebuild, -python-levenshtein-0.10.ebuild,
+  python-levenshtein-0.10.2-r1.ebuild:
+  Add missing setuptools dep, QA fixes, drop old.
 
   22 May 2013; Agostino Sarubbo <ago@gentoo.org>
   python-levenshtein-0.10.2-r1.ebuild:
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.10.2-r1.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.10.2-r1.ebuild
index fc2e88362950..7ffd04433cc6 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.10.2-r1.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.10.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-levenshtein/python-levenshtein-0.10.2-r1.ebuild,v 1.4 2013/05/22 10:36:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-levenshtein/python-levenshtein-0.10.2-r1.ebuild,v 1.5 2013/08/14 13:18:24 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="amd64 ia64 x86"
 IUSE="doc"
 
-DEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
@@ -33,9 +33,6 @@ python_compile_all() {
 }
 
 python_install_all() {
-	if use doc; then
-		 dodoc README.rst Levenshtein.html
-	else
-		dodoc README.rst
-	fi
+	use doc && local HTML_DOCS=( Levenshtein.html )
+	distutils-r1_python_install_all
 }
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.10.2.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.10.2.ebuild
deleted file mode 100644
index dc91718a6903..000000000000
--- a/dev-python/python-levenshtein/python-levenshtein-0.10.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-levenshtein/python-levenshtein-0.10.2.ebuild,v 1.5 2012/12/17 17:10:46 ago Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-MY_PN="python-Levenshtein"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Functions for fast computation of Levenshtein (edit) distance, and edit operations"
-HOMEPAGE="http://github.com/miohtama/python-Levenshtein/tree/
-	http://pypi.python.org/pypi/python-Levenshtein/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		PYTHONPATH="$(ls -d build-$(PYTHON -f --ABI)/lib.*)" "$(PYTHON -f)" "${FILESDIR}/genextdoc.py" Levenshtein || die "Generation of documentation failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml Levenshtein.html || die "Installation of documentation failed"
-	fi
-}
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.10.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.10.ebuild
deleted file mode 100644
index 66d9f89db4cf..000000000000
--- a/dev-python/python-levenshtein/python-levenshtein-0.10.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-levenshtein/python-levenshtein-0.10.ebuild,v 1.8 2012/02/21 07:20:14 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils
-
-MY_PN="python-Levenshtein"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Levenshtein contains functions for fast computation of Levenshtein (edit) distance, and edit operations"
-HOMEPAGE="http://trific.ath.cx/resources/python/levenshtein/"
-SRC_URI="http://trific.ath.cx/Ftp//python/levenshtein/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~x86"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		PYTHONPATH="$(ls -d build-$(PYTHON -f --ABI)/lib.*)" "$(PYTHON -f)" "${FILESDIR}/genextdoc.py" Levenshtein || die "Generation of documentation failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml Levenshtein.html || die "Installation of documentation failed"
-	fi
-}