Clean up obsolete dependencies on virtual/python-argparse and virtual/python-unittest2 (those packages were only required for <=python-2.6).

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

8 files changed, 22 insertions, 23 deletions

diff --git a/dev-python/keyring/ChangeLog b/dev-python/keyring/ChangeLog
index 4d51d1fac554..564307839cfb 100644
--- a/dev-python/keyring/ChangeLog
+++ b/dev-python/keyring/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/keyring
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/ChangeLog,v 1.14 2014/03/31 20:35:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/ChangeLog,v 1.15 2014/07/06 12:42:45 mgorny Exp $
+
+  06 Jul 2014; Michał Górny <mgorny@gentoo.org> keyring-1.0.ebuild,
+  keyring-1.5-r1.ebuild, keyring-1.5.ebuild, keyring-1.6.1.ebuild,
+  keyring-3.1.ebuild, keyring-3.3.ebuild, keyring-3.7.ebuild:
+  Clean up obsolete dependencies on virtual/python-argparse and virtual/python-
+  unittest2 (those packages were only required for <=python-2.6).
 
   31 Mar 2014; Michał Górny <mgorny@gentoo.org> keyring-1.0.ebuild,
   keyring-1.5-r1.ebuild, keyring-1.5.ebuild, keyring-3.1.ebuild,
diff --git a/dev-python/keyring/keyring-1.0.ebuild b/dev-python/keyring/keyring-1.0.ebuild
index 11284ff91be8..a726b5e25bcc 100644
--- a/dev-python/keyring/keyring-1.0.ebuild
+++ b/dev-python/keyring/keyring-1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.0.ebuild,v 1.7 2014/03/31 20:35:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.0.ebuild,v 1.8 2014/07/06 12:42:45 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
@@ -16,8 +16,7 @@ KEYWORDS="~amd64 ~x86"
 SLOT="0"
 IUSE="test"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( virtual/python-unittest2[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
 PATCHES=(
diff --git a/dev-python/keyring/keyring-1.5-r1.ebuild b/dev-python/keyring/keyring-1.5-r1.ebuild
index 6598aa11dda0..57eb6a3cdcae 100644
--- a/dev-python/keyring/keyring-1.5-r1.ebuild
+++ b/dev-python/keyring/keyring-1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.5-r1.ebuild,v 1.4 2014/03/31 20:35:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.5-r1.ebuild,v 1.5 2014/07/06 12:42:45 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} python{3_2,3_3} pypy pypy2_0 )
@@ -19,8 +19,7 @@ IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		app-arch/unzip
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		test? ( virtual/python-unittest2[${PYTHON_USEDEP}] )"
+		dev-python/pytest-runner[${PYTHON_USEDEP}]"
 RDEPEND=""
 
 PATCHES=(
diff --git a/dev-python/keyring/keyring-1.5.ebuild b/dev-python/keyring/keyring-1.5.ebuild
index 8a348319ca42..d9ddb4a7254b 100644
--- a/dev-python/keyring/keyring-1.5.ebuild
+++ b/dev-python/keyring/keyring-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.5.ebuild,v 1.3 2014/03/31 20:35:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.5.ebuild,v 1.4 2014/07/06 12:42:45 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} python{3_2,3_3} pypy pypy2_0 )
@@ -19,8 +19,7 @@ IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		app-arch/unzip
-	test? ( virtual/python-unittest2[${PYTHON_USEDEP}] )"
+		app-arch/unzip"
 RDEPEND=""
 
 PATCHES=(
diff --git a/dev-python/keyring/keyring-1.6.1.ebuild b/dev-python/keyring/keyring-1.6.1.ebuild
index 907bb9778934..81f8c8138a3e 100644
--- a/dev-python/keyring/keyring-1.6.1.ebuild
+++ b/dev-python/keyring/keyring-1.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.6.1.ebuild,v 1.1 2013/12/12 15:22:02 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-1.6.1.ebuild,v 1.2 2014/07/06 12:42:45 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} python{3_2,3_3} )
@@ -19,8 +19,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		app-arch/unzip
 	test? ( dev-python/pytest-runner[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-		virtual/python-unittest2[${PYTHON_USEDEP}] )"
+		dev-python/pycrypto[${PYTHON_USEDEP}] )"
 RDEPEND=""
 
 python_prepare_all() {
diff --git a/dev-python/keyring/keyring-3.1.ebuild b/dev-python/keyring/keyring-3.1.ebuild
index 4c1fdc4d0182..563ddc011a59 100644
--- a/dev-python/keyring/keyring-3.1.ebuild
+++ b/dev-python/keyring/keyring-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-3.1.ebuild,v 1.2 2014/03/31 20:35:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-3.1.ebuild,v 1.3 2014/07/06 12:42:45 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} python{3_2,3_3} pypy pypy2_0 )
@@ -19,8 +19,7 @@ IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		dev-python/pytest-runner[${PYTHON_USEDEP}]
-		app-arch/unzip
-	test? ( virtual/python-unittest2[${PYTHON_USEDEP}] )"
+		app-arch/unzip"
 RDEPEND=""
 
 PATCHES=(
diff --git a/dev-python/keyring/keyring-3.3.ebuild b/dev-python/keyring/keyring-3.3.ebuild
index 09ba650067cb..ddc3842660d9 100644
--- a/dev-python/keyring/keyring-3.3.ebuild
+++ b/dev-python/keyring/keyring-3.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-3.3.ebuild,v 1.2 2014/03/31 20:35:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-3.3.ebuild,v 1.3 2014/07/06 12:42:45 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} python{3_2,3_3} pypy pypy2_0)
@@ -17,8 +17,7 @@ IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		app-arch/unzip
-	test? ( virtual/python-unittest2[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-runner[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pycrypto[$(python_gen_usedep 'python2*' 'python3*')] )"
diff --git a/dev-python/keyring/keyring-3.7.ebuild b/dev-python/keyring/keyring-3.7.ebuild
index 7941361fb976..b8ab8acb48f4 100644
--- a/dev-python/keyring/keyring-3.7.ebuild
+++ b/dev-python/keyring/keyring-3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-3.7.ebuild,v 1.2 2014/03/31 20:35:57 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/keyring/keyring-3.7.ebuild,v 1.3 2014/07/06 12:42:45 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} python{3_2,3_3} pypy pypy2_0)
@@ -17,8 +17,7 @@ IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		app-arch/unzip
-	test? ( virtual/python-unittest2[${PYTHON_USEDEP}]
-		dev-python/pytest-runner[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-runner[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pycrypto[$(python_gen_usedep 'python2*' 'python3*')] )"