dev-python/ansi2html: 0.10.0, fix license

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

6 files changed, 55 insertions, 8 deletions

diff --git a/dev-python/ansi2html/ChangeLog b/dev-python/ansi2html/ChangeLog
index 7fca843b52e1..5a616c61afe6 100644
--- a/dev-python/ansi2html/ChangeLog
+++ b/dev-python/ansi2html/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-python/ansi2html
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ChangeLog,v 1.9 2013/09/05 18:46:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ChangeLog,v 1.10 2013/09/28 13:49:15 sping Exp $
+
+  28 Sep 2013; Sebastian Pipping <sping@gentoo.org> ansi2html-0.9.1-r1.ebuild,
+  ansi2html-0.9.3-r1.ebuild, ansi2html-0.9.4.ebuild, +ansi2html-0.10.0.ebuild,
+  metadata.xml:
+  Fix license to GPL-3+
+
+*ansi2html-0.10.0 (28 Sep 2013)
+
+  28 Sep 2013; Sebastian Pipping <sping@gentoo.org> +ansi2html-0.10.0.ebuild,
+  metadata.xml:
+  Bump to 0.10.0, add myself as maintainer, update license to GPL-3+
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> ansi2html-0.9.3-r1.ebuild,
   ansi2html-0.9.4.ebuild:
diff --git a/dev-python/ansi2html/ansi2html-0.10.0.ebuild b/dev-python/ansi2html/ansi2html-0.10.0.ebuild
new file mode 100644
index 000000000000..986fea67251e
--- /dev/null
+++ b/dev-python/ansi2html/ansi2html-0.10.0.ebuild
@@ -0,0 +1,32 @@
+# 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.10.0.ebuild,v 1.1 2013/09/28 13:49:15 sping Exp $
+
+EAPI=5
+
+# ordereddict is need for < 2.7, but it's not packaged (yet)
+PYTHON_COMPAT=( python{2_7,3_2,3_3} 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
index 4af89a41ef99..e3b6a47ae1ff 100644
--- a/dev-python/ansi2html/ansi2html-0.9.1-r1.ebuild
+++ b/dev-python/ansi2html/ansi2html-0.9.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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.1 2012/08/14 21:14:18 iksaif Exp $
+# $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"
 
@@ -16,7 +16,7 @@ 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="BSD"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
diff --git a/dev-python/ansi2html/ansi2html-0.9.3-r1.ebuild b/dev-python/ansi2html/ansi2html-0.9.3-r1.ebuild
index 2554f64f19e1..f894e5365946 100644
--- a/dev-python/ansi2html/ansi2html-0.9.3-r1.ebuild
+++ b/dev-python/ansi2html/ansi2html-0.9.3-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/ansi2html/ansi2html-0.9.3-r1.ebuild,v 1.2 2013/09/05 18:46:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-0.9.3-r1.ebuild,v 1.3 2013/09/28 13:49:15 sping Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ 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="BSD"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
diff --git a/dev-python/ansi2html/ansi2html-0.9.4.ebuild b/dev-python/ansi2html/ansi2html-0.9.4.ebuild
index b428b8920a20..cd89edaaa323 100644
--- a/dev-python/ansi2html/ansi2html-0.9.4.ebuild
+++ b/dev-python/ansi2html/ansi2html-0.9.4.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/ansi2html/ansi2html-0.9.4.ebuild,v 1.2 2013/09/05 18:46:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ansi2html/ansi2html-0.9.4.ebuild,v 1.3 2013/09/28 13:49:15 sping Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ 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="BSD"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
diff --git a/dev-python/ansi2html/metadata.xml b/dev-python/ansi2html/metadata.xml
index 633a9baf58a2..779f874c90cf 100644
--- a/dev-python/ansi2html/metadata.xml
+++ b/dev-python/ansi2html/metadata.xml
@@ -6,6 +6,10 @@
 		<email>iksaif@gentoo.org</email>
 		<name>Corentin Chary</name>
 	</maintainer>
+	<maintainer>
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">ansi2html</remote-id>
 		<remote-id type="github">ralphbean/ansi2html</remote-id>