bump

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

6 files changed, 11 insertions, 128 deletions

diff --git a/dev-python/argh/ChangeLog b/dev-python/argh/ChangeLog
index b350a24402d3..dcad5e3d7601 100644
--- a/dev-python/argh/ChangeLog
+++ b/dev-python/argh/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/argh
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/ChangeLog,v 1.21 2014/10/10 15:24:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/ChangeLog,v 1.22 2014/10/31 03:30:32 idella4 Exp $
+
+*argh-0.26.0 (31 Oct 2014)
+
+  31 Oct 2014; Ian Delaney <idella4@gentoo.org> +argh-0.26.0.ebuild,
+  -argh-0.23.0-r1.ebuild, -argh-0.23.1.ebuild, -argh-0.23.2.ebuild,
+  -argh-0.23.3.ebuild, -argh-0.24.1.ebuild:
+  bump
 
   10 Oct 2014; Agostino Sarubbo <ago@gentoo.org> argh-0.25.0.ebuild:
   Stable for amd64, wrt bug #518240
diff --git a/dev-python/argh/argh-0.23.1.ebuild b/dev-python/argh/argh-0.23.1.ebuild
deleted file mode 100644
index 4ff2afe50a23..000000000000
--- a/dev-python/argh/argh-0.23.1.ebuild
+++ /dev/null
@@ -1,31 +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/argh/argh-0.23.1.ebuild,v 1.4 2014/07/06 12:36:21 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_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=""
-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/argh-0.23.2.ebuild b/dev-python/argh/argh-0.23.2.ebuild
deleted file mode 100644
index 659c7955d886..000000000000
--- a/dev-python/argh/argh-0.23.2.ebuild
+++ /dev/null
@@ -1,31 +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/argh/argh-0.23.2.ebuild,v 1.4 2014/07/06 12:36:21 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_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=""
-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/argh-0.23.3.ebuild b/dev-python/argh/argh-0.23.3.ebuild
deleted file mode 100644
index c9aed200f8f3..000000000000
--- a/dev-python/argh/argh-0.23.3.ebuild
+++ /dev/null
@@ -1,31 +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/argh/argh-0.23.3.ebuild,v 1.4 2014/07/06 12:36:21 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_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=""
-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/argh-0.24.1.ebuild b/dev-python/argh/argh-0.24.1.ebuild
deleted file mode 100644
index 81b98fc01d6b..000000000000
--- a/dev-python/argh/argh-0.24.1.ebuild
+++ /dev/null
@@ -1,31 +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/argh/argh-0.24.1.ebuild,v 1.3 2014/07/06 12:36:21 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_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=""
-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/argh-0.23.0-r1.ebuild b/dev-python/argh/argh-0.26.0.ebuild
index f686a3be75c0..4434d7158948 100644
--- a/dev-python/argh/argh-0.23.0-r1.ebuild
+++ b/dev-python/argh/argh-0.26.0.ebuild
@@ -1,10 +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/argh/argh-0.23.0-r1.ebuild,v 1.5 2014/07/06 12:36:21 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/argh/argh-0.26.0.ebuild,v 1.1 2014/10/31 03:30:32 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
 
 inherit distutils-r1
 
@@ -21,10 +21,10 @@ RDEPEND=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
 		${RDEPEND}
 	)"
 
 python_test() {
-	# setup.py tries to install argparse for some reason...
 	py.test || die "Tests fail with ${EPYTHON}"
 }