Convert to distutils-r1. Remove old.

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

5 files changed, 53 insertions, 77 deletions

diff --git a/dev-python/oauth2/ChangeLog b/dev-python/oauth2/ChangeLog
index bc77e5110540..b6d58be84190 100644
--- a/dev-python/oauth2/ChangeLog
+++ b/dev-python/oauth2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/oauth2
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth2/ChangeLog,v 1.7 2012/01/29 00:18:03 weaver Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth2/ChangeLog,v 1.8 2013/05/09 23:14:25 floppym Exp $
+
+*oauth2-1.5.211-r1 (09 May 2013)
+
+  09 May 2013; Mike Gilbert <floppym@gentoo.org>
+  +files/oauth2-exclude-tests.patch, +oauth2-1.5.211-r1.ebuild,
+  -oauth2-1.5.170.ebuild, -oauth2-1.5.211.ebuild:
+  Convert to distutils-r1. Remove old.
 
 *oauth2-1.5.211 (29 Jan 2012)
 
@@ -33,4 +40,3 @@
   28 Sep 2010; Dirkjan Ochtman <djc@gentoo.org> +oauth2-1.2.1.ebuild,
   +metadata.xml:
   Initial version.
-
diff --git a/dev-python/oauth2/files/oauth2-exclude-tests.patch b/dev-python/oauth2/files/oauth2-exclude-tests.patch
new file mode 100644
index 000000000000..e2296d869e93
--- /dev/null
+++ b/dev-python/oauth2/files/oauth2-exclude-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index acc41e1..1efd034 100755
+--- a/setup.py
++++ b/setup.py
+@@ -31,7 +31,7 @@ setup(name=PKG,
+       author="Joe Stump",
+       author_email="joe@simplegeo.com",
+       url="http://github.com/simplegeo/python-oauth2",
+-      packages = find_packages(),
++      packages = find_packages(exclude=['tests']),
+       install_requires = ['httplib2'],
+       license = "MIT License",
+       keywords="oauth",
diff --git a/dev-python/oauth2/oauth2-1.5.170.ebuild b/dev-python/oauth2/oauth2-1.5.170.ebuild
deleted file mode 100644
index e17e78a9dc4e..000000000000
--- a/dev-python/oauth2/oauth2-1.5.170.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth2/oauth2-1.5.170.ebuild,v 1.2 2011/09/24 13:43:16 grobian Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="Library for OAuth version 1.0"
-HOMEPAGE="http://pypi.python.org/pypi/oauth2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="dev-python/httplib2"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	test? (
-		dev-python/coverage
-		dev-python/mock
-	)"
-
-src_install() {
-	distutils_src_install
-
-	delete_tests() {
-		rm -fr "${ED}$(python_get_sitedir)/tests"
-	}
-	python_execute_function -q delete_tests
-}
diff --git a/dev-python/oauth2/oauth2-1.5.211-r1.ebuild b/dev-python/oauth2/oauth2-1.5.211-r1.ebuild
new file mode 100644
index 000000000000..8e99ec8c1e6a
--- /dev/null
+++ b/dev-python/oauth2/oauth2-1.5.211-r1.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/oauth2/oauth2-1.5.211-r1.ebuild,v 1.1 2013/05/09 23:14:25 floppym Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for OAuth version 1.0"
+HOMEPAGE="http://pypi.python.org/pypi/oauth2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="dev-python/httplib2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}/${PN}-exclude-tests.patch" )
+
+python_test() {
+	esetup.py test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/oauth2/oauth2-1.5.211.ebuild b/dev-python/oauth2/oauth2-1.5.211.ebuild
deleted file mode 100644
index 776cdfbd10fc..000000000000
--- a/dev-python/oauth2/oauth2-1.5.211.ebuild
+++ /dev/null
@@ -1,37 +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/oauth2/oauth2-1.5.211.ebuild,v 1.1 2012/01/29 00:18:03 weaver Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils
-
-DESCRIPTION="Library for OAuth version 1.0"
-HOMEPAGE="http://pypi.python.org/pypi/oauth2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE="test"
-
-RDEPEND="dev-python/httplib2"
-DEPEND="${RDEPEND}
-	dev-python/setuptools
-	test? (
-		dev-python/coverage
-		dev-python/mock
-	)"
-
-src_install() {
-	distutils_src_install
-
-	delete_tests() {
-		rm -fr "${ED}$(python_get_sitedir)/tests"
-	}
-	python_execute_function -q delete_tests
-}