Version bump, add missing test dependency on dev-python/mock, drop old

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 0x5D21B852895192F9)

6 files changed, 39 insertions, 115 deletions

diff --git a/dev-python/argh/ChangeLog b/dev-python/argh/ChangeLog
index 9ef5d1a6f145..eebf971d88b4 100644
--- a/dev-python/argh/ChangeLog
+++ b/dev-python/argh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/argh
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/ChangeLog,v 1.9 2013/02/12 00:55:19 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/ChangeLog,v 1.10 2013/03/18 09:15:19 xarthisius Exp $
+
+*argh-0.23.1 (18 Mar 2013)
+
+  18 Mar 2013; Kacper Kowalik <xarthisius@gentoo.org> +argh-0.23.1.ebuild,
+  -argh-0.21.1.ebuild, -argh-0.22.0.ebuild, -argh-0.23.0.ebuild,
+  -files/argh-0.17.2-setup.py.patch:
+  Version bump, add missing test dependency on dev-python/mock, drop old
 
   12 Feb 2013; Michał Górny <mgorny@gentoo.org> argh-0.23.0-r1.ebuild:
   Make test failures fatal.
diff --git a/dev-python/argh/argh-0.21.1.ebuild b/dev-python/argh/argh-0.21.1.ebuild
deleted file mode 100644
index c2413e9ec55b..000000000000
--- a/dev-python/argh/argh-0.21.1.ebuild
+++ /dev/null
@@ -1,28 +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/argh/argh-0.21.1.ebuild,v 1.1 2013/01/11 06:19:46 patrick Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 2.5-jython"
-PYTHON_MODNAME="argh"
-
-inherit distutils eutils
-
-DESCRIPTION="A simple argparse wrapper."
-HOMEPAGE="http://packages.python.org/argh/"
-SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-3"
-
-RDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.17.2-setup.py.patch"
-	distutils_src_prepare
-}
diff --git a/dev-python/argh/argh-0.22.0.ebuild b/dev-python/argh/argh-0.22.0.ebuild
deleted file mode 100644
index 9af4d196123b..000000000000
--- a/dev-python/argh/argh-0.22.0.ebuild
+++ /dev/null
@@ -1,23 +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/argh/argh-0.22.0.ebuild,v 1.2 2013/02/02 01:16:04 mr_bones_ Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 2.5-jython"
-PYTHON_MODNAME="argh"
-
-inherit distutils eutils
-
-DESCRIPTION="A simple argparse wrapper."
-HOMEPAGE="http://packages.python.org/argh/"
-SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-3"
-
-RDEPEND=""
-DEPEND=""
diff --git a/dev-python/argh/argh-0.23.0.ebuild b/dev-python/argh/argh-0.23.0.ebuild
deleted file mode 100644
index 56e94cb6046e..000000000000
--- a/dev-python/argh/argh-0.23.0.ebuild
+++ /dev/null
@@ -1,23 +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/argh/argh-0.23.0.ebuild,v 1.1 2013/02/08 09:08:59 patrick Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 2.5-jython"
-PYTHON_MODNAME="argh"
-
-inherit distutils eutils
-
-DESCRIPTION="A simple argparse wrapper."
-HOMEPAGE="http://packages.python.org/argh/"
-SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-3"
-
-RDEPEND=""
-DEPEND=""
diff --git a/dev-python/argh/argh-0.23.1.ebuild b/dev-python/argh/argh-0.23.1.ebuild
new file mode 100644
index 000000000000..3e272a2c5cff
--- /dev/null
+++ b/dev-python/argh/argh-0.23.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.23.1.ebuild,v 1.1 2013/03/18 09:15:19 xarthisius Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="A simple argparse wrapper"
+HOMEPAGE="http://packages.python.org/argh/"
+SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-3"
+IUSE="test"
+
+RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		${RDEPEND}
+	)"
+
+python_test() {
+	# setup.py tries to install argparse for some reason...
+	py.test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/argh/files/argh-0.17.2-setup.py.patch b/dev-python/argh/files/argh-0.17.2-setup.py.patch
deleted file mode 100644
index b3bd799bb116..000000000000
--- a/dev-python/argh/files/argh-0.17.2-setup.py.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# HG changeset patch
-# User Mike Gilbert <floppym@gentoo.org>
-# Date 1357409273 18000
-# Node ID c4ba9e12eee5964399d62f638e02d6791c7d220c
-# Parent  0942fae60b774e5a59b76295a05365168a35464e
-Specify encoding when opening files in setup.py
-
-Fixes UnicodeDecodeError when installing under python3 with LANG=C.
-https://bugs.gentoo.org/show_bug.cgi?id=448728
-
-diff --git a/setup.py b/setup.py
---- a/setup.py
-+++ b/setup.py
-@@ -20,6 +20,7 @@
- #    along with Argh.  If not, see <http://gnu.org/licenses/>.
- 
- 
-+import io
- import os
- 
- # Why distutils?
-@@ -36,7 +37,7 @@
- # Importing `__version__` from `argh` would trigger a cascading import
- # of `argparse`. We need to avoid this as Python < 2.7 ships without argparse.
- __version__ = None
--with open('argh/__init__.py') as f:
-+with io.open('argh/__init__.py', encoding='utf8') as f:
-     for line in f:
-         if line.startswith('__version__'):
-             exec(line)
-@@ -44,7 +45,8 @@
- assert __version__, 'argh.__version__ must be imported correctly'
- 
- 
--readme = open(os.path.join(os.path.dirname(__file__), 'README')).read()
-+with io.open(os.path.join(os.path.dirname(__file__), 'README'), encoding='ascii') as f:
-+	readme = f.read()
- 
- 
- setup(