bump; clean old impls, add py3.4, tidy deps, add man page to install, upgrade DOCS

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

7 files changed, 21 insertions, 174 deletions

diff --git a/dev-python/ansi2html/ChangeLog b/dev-python/ansi2html/ChangeLog
index cc8a8bf3fce6..ba9bab553bfa 100644
--- a/dev-python/ansi2html/ChangeLog
+++ b/dev-python/ansi2html/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/ansi2html
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ChangeLog,v 1.16 2014/03/31 20:48:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ChangeLog,v 1.17 2014/10/25 06:45:32 idella4 Exp $
+
+*ansi2html-1.0.7 (25 Oct 2014)
+
+  25 Oct 2014; Ian Delaney <idella4@gentoo.org> +ansi2html-1.0.7.ebuild,
+  -ansi2html-0.10.0.ebuild, -ansi2html-0.9.1-r1.ebuild,
+  -ansi2html-0.9.3-r1.ebuild, -ansi2html-0.9.4.ebuild, -ansi2html-1.0.2.ebuild,
+  -ansi2html-1.0.5.ebuild:
+  bump; clean old impls, add py3.4, tidy deps, add man page to install, upgrade
+  DOCS
 
   31 Mar 2014; Michał Górny <mgorny@gentoo.org> ansi2html-0.10.0.ebuild,
   ansi2html-0.9.3-r1.ebuild, ansi2html-0.9.4.ebuild, ansi2html-1.0.2.ebuild,
diff --git a/dev-python/ansi2html/ansi2html-0.10.0.ebuild b/dev-python/ansi2html/ansi2html-0.10.0.ebuild
deleted file mode 100644
index 327a4f583a12..000000000000
--- a/dev-python/ansi2html/ansi2html-0.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-0.10.0.ebuild,v 1.2 2014/03/31 20:48:37 mgorny Exp $
-
-EAPI=5
-
-# ordereddict is need for < 2.7, but it's not packaged (yet)
-PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="http://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -w tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/ansi2html/ansi2html-0.9.1-r1.ebuild b/dev-python/ansi2html/ansi2html-0.9.1-r1.ebuild
deleted file mode 100644
index e3b6a47ae1ff..000000000000
--- a/dev-python/ansi2html/ansi2html-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-0.9.1-r1.ebuild,v 1.2 2013/09/28 13:49:15 sping Exp $
-
-EAPI="4"
-
-# ordereddict is need for < 2.7, but it's not packaged (yet)
-PYTHON_DEPEND="*:2.7"
-SUPPORT_PYTHON_ABIS="1"
-DISTUTILS_SRC_TEST="nosetests"
-RESTRICT_PYTHON_ABIS="2.5 2.5-jython"
-
-inherit distutils eutils
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="http://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose
-		dev-python/mock
-	)
-	dev-python/setuptools"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.9.1-fix-0-control-code.patch"
-	if use test; then
-		epatch "${FILESDIR}/${PN}-0.9.1-fix-sys-argv-in-tests.patch"
-	fi
-}
diff --git a/dev-python/ansi2html/ansi2html-0.9.3-r1.ebuild b/dev-python/ansi2html/ansi2html-0.9.3-r1.ebuild
deleted file mode 100644
index 7139bafa7e2a..000000000000
--- a/dev-python/ansi2html/ansi2html-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-0.9.3-r1.ebuild,v 1.4 2014/03/31 20:48:37 mgorny Exp $
-
-EAPI=5
-
-# ordereddict is need for < 2.7, but it's not packaged (yet)
-PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="http://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -w tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/ansi2html/ansi2html-0.9.4.ebuild b/dev-python/ansi2html/ansi2html-0.9.4.ebuild
deleted file mode 100644
index d6e770402dd0..000000000000
--- a/dev-python/ansi2html/ansi2html-0.9.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-0.9.4.ebuild,v 1.4 2014/03/31 20:48:36 mgorny Exp $
-
-EAPI=5
-
-# ordereddict is need for < 2.7, but it's not packaged (yet)
-PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="http://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -w tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/ansi2html/ansi2html-1.0.2.ebuild b/dev-python/ansi2html/ansi2html-1.0.2.ebuild
deleted file mode 100644
index d1e7a8881129..000000000000
--- a/dev-python/ansi2html/ansi2html-1.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-1.0.2.ebuild,v 1.2 2014/03/31 20:48:37 mgorny Exp $
-
-EAPI=5
-
-# ordereddict is need for < 2.7, but it's not packaged (yet)
-PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="http://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -w tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/ansi2html/ansi2html-1.0.5.ebuild b/dev-python/ansi2html/ansi2html-1.0.7.ebuild
index 9775f40caff6..f3301ab2d179 100644
--- a/dev-python/ansi2html/ansi2html-1.0.5.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.0.7.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-1.0.5.ebuild,v 1.3 2014/03/31 20:48:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-1.0.7.ebuild,v 1.1 2014/10/25 06:45:32 idella4 Exp $
 
 EAPI=5
 
-# ordereddict is need for < 2.7, but it's not packaged (yet)
-PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 inherit distutils-r1
 
@@ -19,14 +18,18 @@ KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
+DEPEND="test? ( ${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
 	)
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_test() {
-	nosetests -w tests \
-		|| die "Tests fail with ${EPYTHON}"
+	nosetests -w tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman man/ansi2html.1
+	DOCS=(  README.rst man/ansi2html.1.txt )
+	distutils-r1_python_install_all
 }