Version bump six to 1.9.0 and remove old versions

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 30380381)

10 files changed, 27 insertions, 265 deletions

diff --git a/dev-python/six/ChangeLog b/dev-python/six/ChangeLog
index fd8a29e01a24..873aec1df1f7 100644
--- a/dev-python/six/ChangeLog
+++ b/dev-python/six/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/six
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/six/ChangeLog,v 1.53 2014/11/25 01:07:11 floppym Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/six/ChangeLog,v 1.54 2015/01/02 18:11:20 djc Exp $
+
+*six-1.9.0 (02 Jan 2015)
+
+  02 Jan 2015; Dirkjan Ochtman <djc@gentoo.org> +files/1.9.0-mapping.patch,
+  +six-1.9.0.ebuild, -six-1.1.0.ebuild, -six-1.2.0-r1.ebuild, -six-1.2.0.ebuild,
+  -six-1.4.0.ebuild, -six-1.4.1.ebuild, -six-1.5.2.ebuild, -six-1.7.2.ebuild,
+  -six-1.7.3.ebuild:
+  Version bump six to 1.9.0 and remove old versions
 
   25 Nov 2014; Mike Gilbert <floppym@gentoo.org> six-1.8.0.ebuild,
   six-9999.ebuild:
diff --git a/dev-python/six/files/1.9.0-mapping.patch b/dev-python/six/files/1.9.0-mapping.patch
new file mode 100644
index 000000000000..96ca9b649c5b
--- /dev/null
+++ b/dev-python/six/files/1.9.0-mapping.patch
@@ -0,0 +1,12 @@
+Patch prevents downloading non essential .inv files during the doc build
+diff -ur six-1.5.2.orig/documentation/conf.py six-1.5.2/documentation/conf.py
+--- documentation/conf.py	2013-09-15 21:52:34.000000000 +0800
++++ documentation/conf.py	2014-01-07 18:19:24.958916446 +0800
+@@ -211,7 +211,3 @@
+      [u"Benjamin Peterson"], 1)
+ ]
+ 
+-# -- Intersphinx ---------------------------------------------------------------
+-
+-intersphinx_mapping = {"py2" : ("https://docs.python.org/2/", None),
+-                       "py3" : ("https://docs.python.org/3/", None)}
diff --git a/dev-python/six/six-1.1.0.ebuild b/dev-python/six/six-1.1.0.ebuild
deleted file mode 100644
index 96a3fa0cb219..000000000000
--- a/dev-python/six/six-1.1.0.ebuild
+++ /dev/null
@@ -1,38 +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/six/six-1.1.0.ebuild,v 1.10 2012/12/17 17:54:35 ago Exp $
-
-EAPI="4"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5-jython"
-
-inherit distutils
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="http://pypi.python.org/pypi/six"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc"
-
-DEPEND="doc? ( dev-python/sphinx )"
-RDEPEND=""
-
-PYTHON_MODNAME="${PN}.py"
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		cd documentation || die
-		emake html
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	if use doc; then
-		dohtml -r documentation/_build/html/*
-	fi
-}
diff --git a/dev-python/six/six-1.2.0-r1.ebuild b/dev-python/six/six-1.2.0-r1.ebuild
deleted file mode 100644
index 31e1684d3520..000000000000
--- a/dev-python/six/six-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,41 +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/six/six-1.2.0-r1.ebuild,v 1.6 2014/03/31 20:41:34 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://bitbucket.org/gutworth/six http://pypi.python.org/pypi/six"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc test"
-
-DEPEND="doc? ( dev-python/sphinx )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# disable tests that require tkinter
-	sed -i -e "s/test_move_items/_&/" test_six.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C documentation html
-}
-
-python_test() {
-	py.test || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( documentation/_build/html/ )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/six/six-1.2.0.ebuild b/dev-python/six/six-1.2.0.ebuild
deleted file mode 100644
index 55d5c0b8c585..000000000000
--- a/dev-python/six/six-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +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/six/six-1.2.0.ebuild,v 1.3 2012/10/06 01:26:56 blueness Exp $
-
-EAPI="4"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5-jython"
-DISTUTILS_SRC_TEST="py.test"
-
-inherit distutils
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="http://pypi.python.org/pypi/six"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc"
-
-DEPEND="doc? ( dev-python/sphinx )"
-
-PYTHON_MODNAME="${PN}.py"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# disable tests that require tkinter
-	sed -i "s/test_move_items/_\0/" test_six.py || die
-}
-
-src_compile() {
-	distutils_src_compile
-	use doc && emake -C documentation html
-}
-
-src_install() {
-	distutils_src_install
-	use doc && dohtml -r documentation/_build/html/*
-}
diff --git a/dev-python/six/six-1.4.0.ebuild b/dev-python/six/six-1.4.0.ebuild
deleted file mode 100644
index d4fe52217234..000000000000
--- a/dev-python/six/six-1.4.0.ebuild
+++ /dev/null
@@ -1,34 +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/six/six-1.4.0.ebuild,v 1.2 2014/03/31 20:41:34 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://bitbucket.org/gutworth/six http://pypi.python.org/pypi/six"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc test"
-
-DEPEND="doc? ( dev-python/sphinx )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C documentation html
-}
-
-python_test() {
-	py.test || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( documentation/_build/html/ )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/six/six-1.4.1.ebuild b/dev-python/six/six-1.4.1.ebuild
deleted file mode 100644
index 082e391f884b..000000000000
--- a/dev-python/six/six-1.4.1.ebuild
+++ /dev/null
@@ -1,34 +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/six/six-1.4.1.ebuild,v 1.4 2014/03/31 20:41:34 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://bitbucket.org/gutworth/six http://pypi.python.org/pypi/six"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="doc? ( dev-python/sphinx )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && emake -C documentation html
-}
-
-python_test() {
-	py.test || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( documentation/_build/html/ )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/six/six-1.5.2.ebuild b/dev-python/six/six-1.5.2.ebuild
deleted file mode 100644
index 9f2051ac877a..000000000000
--- a/dev-python/six/six-1.5.2.ebuild
+++ /dev/null
@@ -1,36 +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/six/six-1.5.2.ebuild,v 1.4 2014/04/07 03:53:13 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://bitbucket.org/gutworth/six http://pypi.python.org/pypi/six"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="doc? ( dev-python/sphinx )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-mapping.patch )
-
-python_compile_all() {
-	use doc && emake -C documentation html
-}
-
-python_test() {
-	py.test || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( documentation/_build/html/ )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/six/six-1.7.3.ebuild b/dev-python/six/six-1.7.3.ebuild
deleted file mode 100644
index 7aa0b37e7941..000000000000
--- a/dev-python/six/six-1.7.3.ebuild
+++ /dev/null
@@ -1,35 +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/six/six-1.7.3.ebuild,v 1.1 2014/07/01 04:10:59 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python 2 and 3 compatibility library"
-HOMEPAGE="https://bitbucket.org/gutworth/six http://pypi.python.org/pypi/six"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc test"
-
-DEPEND="doc? ( dev-python/sphinx )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5.2-mapping.patch )
-
-python_compile_all() {
-	use doc && emake -C documentation html
-}
-
-python_test() {
-	py.test -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( documentation/_build/html/ )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/six/six-1.7.2.ebuild b/dev-python/six/six-1.9.0.ebuild
index b257fbcd04bd..920b067b692a 100644
--- a/dev-python/six/six-1.7.2.ebuild
+++ b/dev-python/six/six-1.9.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.7.2.ebuild,v 1.1 2014/06/10 03:28:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.9.0.ebuild,v 1.1 2015/01/02 18:11:20 djc Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
 
 inherit distutils-r1
 
@@ -13,13 +13,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="doc test"
 
 DEPEND="doc? ( dev-python/sphinx )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.5.2-mapping.patch )
+PATCHES=( "${FILESDIR}"/${PV}-mapping.patch )
 
 python_compile_all() {
 	use doc && emake -C documentation html