bump; cease using redundant patch, update dep, tidy test phase, rm olds

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

7 files changed, 21 insertions, 154 deletions

diff --git a/dev-python/wsgiintercept/ChangeLog b/dev-python/wsgiintercept/ChangeLog
index 7132d7d9f4c6..7459664e8a20 100644
--- a/dev-python/wsgiintercept/ChangeLog
+++ b/dev-python/wsgiintercept/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/wsgiintercept
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgiintercept/ChangeLog,v 1.7 2014/06/09 07:56:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgiintercept/ChangeLog,v 1.8 2014/06/10 10:28:10 idella4 Exp $
+
+  10 Jun 2014; Ian Delaney <idella4@gentoo.org> -wsgiintercept-0.5.1.ebuild,
+  -wsgiintercept-0.6.0.ebuild, -wsgiintercept-0.6.1.ebuild,
+  -wsgiintercept-0.6.2.ebuild, wsgiintercept-0.6.4.ebuild:
+  bump; cease using redundant patch, update dep, tidy test phase, rm olds
 
 *wsgiintercept-0.6.4 (09 Jun 2014)
 
diff --git a/dev-python/wsgiintercept/Manifest b/dev-python/wsgiintercept/Manifest
index 37400c63b187..289d280cb77a 100644
--- a/dev-python/wsgiintercept/Manifest
+++ b/dev-python/wsgiintercept/Manifest
@@ -1,15 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0.6.0-fix-tests.patch 588 SHA256 18b11a58be339e15dd5e5ce0c1613f6b98758ee6fed052d0f9e02c5eff874a72 SHA512 0a4563fbc967793715f739e57a8f7240eb554dfce80a73669a3cfc10befa5a3e60ee78efefef1f5da2a584f8933368a3194dd9574dee35f369834f32d5364e14 WHIRLPOOL 8f9c48128c12b846614ac020f80d5c189d5b566687502ba72fe37353f28d7f7605d228b746d8a94f287999dbfd57194827830d0b3ee4b3658110739e3dcbe426
-DIST wsgi_intercept-0.5.1.tar.gz 40797 SHA256 0603a5735152c6da7b31225fc659745838addc15231b39226d68039b6773ba2e SHA512 d1db66e8724cc7226198a3690294b32fa2b52cfd668a380b4feaa5a97d3587721da44733560ddfe45780df31eb898330f97d65da9332d2d84359d886171b29d5 WHIRLPOOL fb4616f2b04399b802c7baf8593128fb353d223da9bc031954df0d797d08c64e0a4630ac74a7276549c572e6f13345f922ecf68ef8fdfe2dba7ff324e9dc8040
-DIST wsgi_intercept-0.6.0.tar.gz 9830 SHA256 fbee9bb0fe6aace0c6297d217bf9910a5099faa173e7e26f69246f5f59dc8754 SHA512 434528d5ec9b2568bea11eecb3f2b8d86f9436c8ff580d013a7bb57d09b760994002ac23bec657720feb422bc4d00914d2e1e6ed7d8111e6e9f4b720904561e3 WHIRLPOOL 48fdf8ccdb0bc0aaa13604733167ed4c7e755a6b0308f283985b729e743021a8a93c01547eec3797d4d96b75a717c2cc0ac2c7da762f9195f1433b819db9b269
-DIST wsgi_intercept-0.6.1.tar.gz 9869 SHA256 656d6cea9c513e1a5db963d5210d579846cca166b47a3c4fcdd0633ce01516e9 SHA512 cffa66149e1d3302b71d60b21d3c00879bd7329bf149dbe5f6f7c4f58cc4b8da0aff4f43702be1688315baff3c3744b40696a44f86dd82ffb23fbc5e05a84bb6 WHIRLPOOL 99bd36cb768de4b80084086246c21a984158d18f0361bd94be362e517d74f076358b07af482841f8a0c2b9153d16a33a773457f874996ad413ca8717b0e9de12
-DIST wsgi_intercept-0.6.2.tar.gz 9883 SHA256 aa44166c53810d5268a496224ad87bca4f4bc035572729c363ae480a49dba97e SHA512 93152a18f9224aa00173df046536d70b8f4b7694810f16d3da6647751ef62fd3c7a584b5220ed2e3a4f2d753576ca8894938d2cb36698d9ebb3fd8d3cc607959 WHIRLPOOL 1266be906d518ad609ed4cabe7f87d3fd6da7d76edcf75285b098eef2b1c64f6da4088b8caa7756ca640a94403fc0f5bf92b35fa01e4754d4da4834172f9db87
 DIST wsgi_intercept-0.6.3.tar.gz 10412 SHA256 a05bae6437014ad4f493281ec044bc136a254387b35068b48ff832566416834e SHA512 ca659a3b389daaafb73ec388cad08c49419904dcb26ceb88ca1fc3ae56a66d246d95da33c3a8ffcc795f48d1717e28971807aeecdb9b8dc3d7e5cc94b2d811fc WHIRLPOOL ab63437a8d6a6f528201c7138a3e217737b6515fc07e36aa4bde1bef0b3166a7c943a5ab79f7521be7483b7bf76d0124492be0a1a4699c072c2eb09a2f8c027e
 DIST wsgi_intercept-0.6.4.tar.gz 10629 SHA256 8ba0349f7517f946d5ffa7a24092070360e9b89ebf41690d19c680891e511f96 SHA512 d1d64de4a3680438860f05a1a540dfaf2928f7cee0fef71ecd8b40654de76af241d9cc9bbb4c66f69aa3e965a42ef0f0f66b35d5ae81f2b6cce2df4a8a2624f9 WHIRLPOOL 88218070585ef2195e0912ac616058539684b23f2761eccba563cab446ba443f206dacdf9493f0cac4f622f489ce53c4281f6ffc1876df22007d3cfe2bb5b28d
-EBUILD wsgiintercept-0.5.1.ebuild 703 SHA256 76ae9b4471ad6ed4932a92153592cf05a5216f4a03e0f7153d6ff6a1b5ef394a SHA512 d0ce5536c5ac2dea5d95683d3c3a4ee83c485d71ccaa94354a6c9cb411c1ae8b2b15173ed38dd0ed16dcc86aacbf7a7a022b4fc4890c58b395b2faa4c23d5217 WHIRLPOOL 51844185d013eff5ef2cb766f5a6dc280b70fc26f152ac806510dc9fe71a0745429a40033ddf0c166aeabf688933122291784ddb04d75c0a837c33763dd1b7a5
-EBUILD wsgiintercept-0.6.0.ebuild 970 SHA256 5a7108fd3913e0aed150cda9dea12e87c1f7e13382bad0e4e0f59f22980fe50f SHA512 e48dbb93a80c925f2b7cc40f8e2ff08d71ffc7d6a7cf142889c036785003fc46db53452801e489f888c827780241ce07160413620e478225bd2c23194dd5ad8b WHIRLPOOL 1928213b0a1c66fe98a210b607ccaf29b8f8f1be967ecb4bfc648b8250157471a647f296c7bba2a19d584a052c239f4b1a9dff9c0202a310d6482f0860b740b0
-EBUILD wsgiintercept-0.6.1.ebuild 971 SHA256 e993d2811487a665a4c44d959290ba6e92f4cf7052045a0b2e433b622cd7890d SHA512 5e91631bf1106ca9bb807c3bec21ce3a914a6b1e8ec6145ff22e00d099e2dc33303b9634e82d21a3d5cf5de2985c354839c39906850518b2c8fa696daa6d4cae WHIRLPOOL d7e13cee1217c740dd7b87ddf8da13e854c09fbb6f1904c8a40effbaa5df1002a8f39b555eb8a36c487e9aca67113c8a59759421316cab267cda6d6fe4a30fa4
-EBUILD wsgiintercept-0.6.2.ebuild 974 SHA256 89f6e89f1c292d5222a4390dd8f94276461b3f2e386259dfcd32eb6a738c2405 SHA512 715bb109876224bc73a5cfa2965889b6137a39b71499821e4bab6966067b4f61ba46a8a0bb1de53da3c0ae4a52abf1dc5975f0e62ff661028b54ad11d5bdf1ab WHIRLPOOL 490a834e3e807f1dd6947840be8cde06290cce9826cdc573075346ff746098195a598e2a128ff606477e211f4842b6da280440eb4adf460716d444d89d99549c
 EBUILD wsgiintercept-0.6.3.ebuild 979 SHA256 2cfba53a9b1faee812973523e35c7323ff361d72107518aa4349d6a363536e85 SHA512 bb763c1827e5fef0c5fa05c9b909e6059e89e47b9cafedc2b485419b7030f1821c8762cfb819c702aaa4039b21d46375d61290049d774297082663834ab63fa4 WHIRLPOOL af5cf02f96a187d1bf30ff0f1cd83950b2aab149166663962eed125b5e7341db0ab25b29dfaf857fc7ed72a49960bbc3ad2615bb38e2df303ea222214ef73d69
-EBUILD wsgiintercept-0.6.4.ebuild 977 SHA256 b1dd7e78d5ff477d38151de6a3f8c7bad6f1c690cff3ac561310d1d58daad94c SHA512 45826df03d2959eb01be3925ff303af7c548551fa7e16090ba448a3025c483c927de814590972f05391764af6acf967664b20a7b264c691ff44f0a1eb18609f6 WHIRLPOOL 65f10d5df544bc6dceaa049c8095f06d03be2aa9a2cad6c35d69a1d057d8c8a6e3c066b5f5b4b07bf1896fd2deec5e41d5c73b5ebf00fbe45d7d9e38754423e3
-MISC ChangeLog 1194 SHA256 1d2c6633eb2949b19d993d19fd68b926fd8a56715f1a87b5a67713fe6079cbb0 SHA512 6d4dac17cdbdb2a533823ea6479010caaf590a2df99d1a9525f9b15d584d979658d7bdbbe23156d1408d09ed77b97731bf115b442bae5b4a05e743c48c726f0a WHIRLPOOL cb7626c430c5015fda86fa5766bb64dc83a4cf709de66e330fa7e9e8cfb9e95b145c7c937e9819a0791493d3b139a2ff0f1481302ee4c7bd023688e5cf9f3cf6
+EBUILD wsgiintercept-0.6.4.ebuild 966 SHA256 b0e6c8c6993c7724ad7b05d61550453dde851ed581dd58b4b0bfd7b81f1c2de2 SHA512 89f37ac9c3b7627fce4802b95ef9960df5496f8395df5bce0a66f68cba45ff02377036f5ad9e38d9113de10c5fdb3ead869c8b6ea45f92d1d4f5227f0ef7ab8c WHIRLPOOL cdffb4a57907bb9938abc2b50beb3c52530ee4902d588032abe1113f5d0a81d7f2afbe62b0069510e1231d6d0752b4141a9610770480ed7d0a8ea9998408746b
+MISC ChangeLog 1468 SHA256 7759f99fa23b55cd25920f19255e6a828095836b83d16a59955d81c254e6724f SHA512 a1fc9c22f75aeb7d30b5bbffe545612234612cce8e11e2f679d9a72d3e1d6ec0e8a2cc7c41f549e14231382b29524f0ef2187ecf53cc042fa3bbfc229cf190d3 WHIRLPOOL f0b1bda5ab4d5fb2e6bf7a03f8a1b7c39c472b6e073cf9c039018848bdc1f9ae09d58eda450a985d8f9ff48ea338bd3a6eb7425ee7eff2767b6a1387bc31821c
 MISC metadata.xml 803 SHA256 f3d30905170a4a3e504e186c384312291b84761ca0334230548e7a985b262fc5 SHA512 852d1126441b4b06eb4697237542f37eb7fa5998917dd1be048fd3ab3d0d72068b58c411c15d4b36caea183a8fdb785248e8a2205c67f534a192f5fb1788b883 WHIRLPOOL 31e66427f88fab303cbfeaadc2433a84d73ab4a89b13e9091759a646e57d5bd2f17dd15299ce2b09d3b3f46fd4d32e16ccf966910a5bbbb10bdbb14c77ee3354
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlOW29sACgkQso7CE7gHKw18zACfSgQUBi38Zr7aqIbrlv7WfXip
+DRoAn2Bn5Ogkv1HJJJ9dNmbZNfeIhrPm
+=tARI
+-----END PGP SIGNATURE-----
diff --git a/dev-python/wsgiintercept/wsgiintercept-0.5.1.ebuild b/dev-python/wsgiintercept/wsgiintercept-0.5.1.ebuild
deleted file mode 100644
index 4018dc266518..000000000000
--- a/dev-python/wsgiintercept/wsgiintercept-0.5.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgiintercept/wsgiintercept-0.5.1.ebuild,v 1.1 2013/07/03 13:14:24 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit distutils-r1
-
-MY_PN="wsgi_intercept"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="WSGI application in place of a real URI for testing"
-HOMEPAGE="https://pypi.python.org/pypi/wsgi_intercept https://code.google.com/p/wsgi-intercept/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-"
-
-S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/wsgiintercept/wsgiintercept-0.6.0.ebuild b/dev-python/wsgiintercept/wsgiintercept-0.6.0.ebuild
deleted file mode 100644
index e0c47deaa4fb..000000000000
--- a/dev-python/wsgiintercept/wsgiintercept-0.6.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgiintercept/wsgiintercept-0.6.0.ebuild,v 1.1 2013/11/27 16:13:23 dev-zero Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_3} )
-
-inherit distutils-r1
-
-MY_PN="wsgi_intercept"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="WSGI application in place of a real URI for testing"
-HOMEPAGE="https://pypi.python.org/pypi/wsgi_intercept https://github.com/cdent/python3-wsgi-intercept"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4[${PYTHON_USEDEP}]
-		>=dev-python/requests-2[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PV}-fix-tests.patch" )
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/wsgiintercept/wsgiintercept-0.6.1.ebuild b/dev-python/wsgiintercept/wsgiintercept-0.6.1.ebuild
deleted file mode 100644
index e5a200d9f5a1..000000000000
--- a/dev-python/wsgiintercept/wsgiintercept-0.6.1.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/wsgiintercept/wsgiintercept-0.6.1.ebuild,v 1.1 2014/02/03 12:41:58 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_3} )
-
-inherit distutils-r1
-
-MY_PN="wsgi_intercept"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="WSGI application in place of a real URI for testing"
-HOMEPAGE="https://pypi.python.org/pypi/wsgi_intercept https://github.com/cdent/python3-wsgi-intercept"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4[${PYTHON_USEDEP}]
-		>=dev-python/requests-2[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/0.6.0-fix-tests.patch" )
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/wsgiintercept/wsgiintercept-0.6.2.ebuild b/dev-python/wsgiintercept/wsgiintercept-0.6.2.ebuild
deleted file mode 100644
index fce0bdb43e2a..000000000000
--- a/dev-python/wsgiintercept/wsgiintercept-0.6.2.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/wsgiintercept/wsgiintercept-0.6.2.ebuild,v 1.1 2014/05/03 08:25:39 patrick Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7,3_3} )
-
-inherit distutils-r1
-
-MY_PN="wsgi_intercept"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="WSGI application in place of a real URI for testing"
-HOMEPAGE="https://pypi.python.org/pypi/wsgi_intercept https://github.com/cdent/python3-wsgi-intercept"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-2.4[${PYTHON_USEDEP}]
-		>=dev-python/requests-2[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/0.6.0-fix-tests.patch" )
-
-python_test() {
-	py.test || die
-}
diff --git a/dev-python/wsgiintercept/wsgiintercept-0.6.4.ebuild b/dev-python/wsgiintercept/wsgiintercept-0.6.4.ebuild
index bf2ec47c3914..e5cadbf8f10f 100644
--- a/dev-python/wsgiintercept/wsgiintercept-0.6.4.ebuild
+++ b/dev-python/wsgiintercept/wsgiintercept-0.6.4.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/wsgiintercept/wsgiintercept-0.6.4.ebuild,v 1.1 2014/06/09 07:56:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgiintercept/wsgiintercept-0.6.4.ebuild,v 1.2 2014/06/10 10:28:10 idella4 Exp $
 
 EAPI=5
 
@@ -26,13 +26,11 @@ DEPEND="
 	test? (
 		dev-python/httplib2[${PYTHON_USEDEP}]
 		>=dev-python/pytest-2.4[${PYTHON_USEDEP}]
-		>=dev-python/requests-2[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.0.1[${PYTHON_USEDEP}]
 	)"
 
 S="${WORKDIR}/${MY_P}"
 
-_PATCHES=( "${FILESDIR}/0.6.0-fix-tests.patch" )
-
 python_test() {
-	py.test || die
+	py.test || die "Tests failed under ${EPYTHON}"
 }