bump; drop py3.2, re-write deps, drop arm keyword to allow addition of new dep blinker

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

3 files changed, 17 insertions, 47 deletions

diff --git a/dev-python/oauthlib/ChangeLog b/dev-python/oauthlib/ChangeLog
index 9f01460b56e7..8bb219a139cb 100644
--- a/dev-python/oauthlib/ChangeLog
+++ b/dev-python/oauthlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/oauthlib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/ChangeLog,v 1.35 2014/09/06 07:47:04 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/ChangeLog,v 1.36 2014/11/06 12:56:24 idella4 Exp $
+
+*oauthlib-0.7.1 (06 Nov 2014)
+
+  06 Nov 2014; Ian Delaney <idella4@gentoo.org> +oauthlib-0.7.1.ebuild,
+  -oauthlib-0.1.3.ebuild, -oauthlib-0.6.1.ebuild:
+  bump; drop py3.2, re-write deps, drop arm keyword to allow addition of new dep
+  blinker
 
   06 Sep 2014; Ian Delaney <idella4@gentoo.org> oauthlib-0.6.3.ebuild:
   re-add py3.2 to support reverse deps, fix syntax in RDEPEND
diff --git a/dev-python/oauthlib/oauthlib-0.1.3.ebuild b/dev-python/oauthlib/oauthlib-0.1.3.ebuild
deleted file mode 100644
index 5161d3a23ce1..000000000000
--- a/dev-python/oauthlib/oauthlib-0.1.3.ebuild
+++ /dev/null
@@ -1,38 +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/oauthlib/oauthlib-0.1.3.ebuild,v 1.11 2014/07/06 12:44:08 mgorny Exp $
-
-EAPI="4"
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.*"
-DISTUTILS_SRC_TEST="nosetests"
-# Tests depend on dict order, see https://github.com/idangazit/oauthlib/issues/40
-PYTHON_TESTS_RESTRICTED_ABIS="*-pypy-*"
-
-inherit distutils
-
-DESCRIPTION="A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"
-HOMEPAGE="https://github.com/idan/oauthlib
-	http://pypi.python.org/pypi/oauthlib"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="test"
-
-RDEPEND="dev-python/rsa"
-DEPEND="${RDEPEND}
-	dev-python/setuptools"
-
-src_test() {
-	touch tests/__init__.py
-	distutils_src_test
-}
-
-src_install() {
-	rm -f tests/__init__.py
-	distutils_src_install
-}
diff --git a/dev-python/oauthlib/oauthlib-0.6.1.ebuild b/dev-python/oauthlib/oauthlib-0.7.1.ebuild
index af880a9a6015..b706af1dafdc 100644
--- a/dev-python/oauthlib/oauthlib-0.6.1.ebuild
+++ b/dev-python/oauthlib/oauthlib-0.7.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.6.1.ebuild,v 1.2 2014/07/06 12:44:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauthlib/oauthlib-0.7.1.ebuild,v 1.1 2014/11/06 12:56:24 idella4 Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
 inherit distutils-r1
 
@@ -13,17 +13,18 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-# >=pycrypto-2.6-r1 for python3 support
-# unittest2 for python2 compat
-RDEPEND=">=dev-python/pycrypto-2.6-r1"
+# optional extras hard set as RDEPs. See setup.py
+RDEPEND=">=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/blinker[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
+	test? ( ${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
 	)"
 
 python_test() {