Convert to distutils-r1. Remove old.

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

6 files changed, 66 insertions, 81 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/Manifest b/dev-python/oauth2/Manifest
index 74c0a94119d0..7633c4c3b894 100644
--- a/dev-python/oauth2/Manifest
+++ b/dev-python/oauth2/Manifest
@@ -1,6 +1,15 @@
-DIST oauth2-1.5.170.tar.gz 18271 SHA256 eb782e7a9a297178518950141d9ea6d442a227c4f14d15193c11f8810ca08b24 SHA512 33b3feb364569dd21bef3c43ca6e50e090f2fd9ae9f2628674a7b46f9b1a622dc4e08f703a0ddf782722725c79e0c8526fe1a144c69ced35bbf954f1ff1eb3bb WHIRLPOOL fe002f3619c99b24bcd912ffb8845f75c051d30bcba8ca23d7343b72b15db37061daf932af85c5a13af2125071dbe6a4781b2099a3ebf0c629e05d1323676788
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX oauth2-exclude-tests.patch 435 SHA256 91ca151e00ca4bcc4ef1a3843de785843fcaf496edd4de8a394a0d96398f07f9 SHA512 365665f7f3f98d85a9484982f445651dfbf1e449e7b06e66eab99c10878251952406aa98abd62e70cc607fc69736e2ca028ef28e153c328d6573d5c3141ca718 WHIRLPOOL 2f4bdcf5aa7f2bdeec2fd5330edf66ff540cda727d48ab88b794ed4a688b3ccf58915e4d99608193b13bb13f3c35bff6a86d0ea8d5bdf0ad106a5de4858a5d86
 DIST oauth2-1.5.211.tar.gz 18608 SHA256 82a38f674da1fa496c0fc4df714cbb058540bed72a30c50a2e344b0d984c4d21 SHA512 3f5606702d4e305c191c924cab01ee3fc7e170a26460c1d49031e3d9a296b3502d5e18edb1ec0e291abd61797cb47b7b2b8929eff33eb8bc9fd73434b3ab028a WHIRLPOOL bd262f4c6d324c048951addc158485bd81c12125fea8cf59545b2cb31c343c793a91cc892d27baeec54b2c62df818e5cb8e9b10196d4f9860fd6e62a37c7bffe
-EBUILD oauth2-1.5.170.ebuild 838 SHA256 e1066a09af2de599d077a3a076ddfbc06bc96b4ac63104d5f6ff4811e5dae6b9 SHA512 99df459b60cf4e02aba4a76cdb4e37688292937486ecd8817ec06b5de05fae45d0a108f5d546875fd53788fbaac6631962c0bd0df57ad0985e6135005e95b24a WHIRLPOOL 74b67cd67983acd6dbd8df5cc14ebe61206cc056f6b86734c817d3fa2db73b9fad6ae02f089790d5d4ad2f719ea17a27fafaa0abcb76eb70460c592de869ce7e
-EBUILD oauth2-1.5.211.ebuild 837 SHA256 7582612d707c10b06ad91761c9bb8a667484143485503a57759145ee836fa94e SHA512 19d4470d12e272a90884af2ba74367495ae6b4fe72a4d66f17d5478cb4fd323c77c939a18c7efcb0b95bed7129316df662e56db082d580fe205259da0f47c2f0 WHIRLPOOL 8cda5ff8a4e33e3e973755e51da8a22d0d57166593111618fc97ee684790af75223b6c8f65240c2968dd3a1ea1989f888ace8ec55a90ff88a7ba81909263d37c
-MISC ChangeLog 1092 SHA256 4c92e8bbf2a8c4cb8adfd251b1e477b0b07029adc1982ad7c5cd08169d7c0bd4 SHA512 3f1f9592dfcb1f54b1bc75f0c3657fea759a050041b8af4342789bce386db3d9feda21862fef30b095fe6839e53ec882516dbb16f672b3ed847ee563e0c95e75 WHIRLPOOL a23a1cadbc8c64ccf33f642192f780dcfff4bcdf2f22cf82d5df9aa61f8a2d6dd5bddec041ee8023b3becea54c51e6f290996953622de39267bf7db557ebe90c
+EBUILD oauth2-1.5.211-r1.ebuild 828 SHA256 44c8ecee61cbc526f1a3657536a692267b8f026e5af333edd5352a342e00411e SHA512 35999d80d58c1018f44da216a92e8ce652306b29fb111a519e456d8b3d9095dd14b7d988fad7635044828a8a48884f1b26f07cc595af1b843fc58713fd5eacfe WHIRLPOOL 16b55adfaa93b8088062c4ae1af928724737885ae29d8520de17160ccaf468519bc3191e221f337f812b5134e58058adab7e1e1499b9ef25599e04417cad784c
+MISC ChangeLog 1329 SHA256 13f600a51db18d75547128791f82419123d413aeb9f488d83f70e4637d3efd48 SHA512 620eb95d1ddefa344570a1ea95382c0e2a0b835a0c6fe6bb817f7ad0fb369351243368cfe560854ca83902105b9f6c5952b405afc356bb873725a4cbaf8289a5 WHIRLPOOL 06f6ad28e7ac4f484c3394079d031c09fd113399c0a694c4e5acd9cff792702e1679b1536c8a70bc9ba17d10be1ab290d9e1344f8d6c94a8d6f680ad7a1cafc8
 MISC metadata.xml 229 SHA256 ea4d3c5d07abcc4469b6dcead838572addee6f561c8fb8bfe5d82970bbe32183 SHA512 5ef19692ce9508ffccdff42e4b79ee36ac1069b2837b9d3b8ca3ddb1b5ecaf5c1ef909c1ec43d84955acd6d3001edd2e8a052ac5d5f21928f891bc8dee34652c WHIRLPOOL 777e15c02d5769544e988e3228f58b74502ece939588b0d10ea1851c796aa92aeef1f2918ea7da12b02468b498af9964397439101baf3fabdef082e1d98a0c46
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlGMLdIACgkQC77qH+pIQ6RbEAEAwq0TExDvs5okUg7CdeSYqNF1
+paRs1pAOuOl398ak7BUBAMXcfjP4zen3ffAUaX6jh57fvMidFoWEBzouYav3F8A+
+=U6YZ
+-----END PGP SIGNATURE-----
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
-}