Fix tests.

Package-Manager: portage-2.2.0_alpha30_p21/cvs/Linux x86_64

5 files changed, 64 insertions, 24 deletions

diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
index 03ef94b2594d..72b95049eec5 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST pycups-1.9.49.tar.bz2 45320 RMD160 f098678ceb01234c2eb06cd52a2e64ac2e33ad3a SHA1 dd27fda553422ee16392b61ae87a02e296bd7b70 SHA256 f38e5640b55521150fc1e0206ebca88b6637a1612e2af82bf9854b3b3512f7be
-DIST pycups-1.9.53.tar.bz2 47178 RMD160 97504c2339c32fb105e8aa2f72e18e99d94ca13e SHA1 020e898a9970b2107af7b7f769574519d64d4f89 SHA256 6fa0aacfdc5216b64be37d47dae7dfef0cd9de3d56064d11d00ad97f0d503b75
+DIST pycups-1.9.55.tar.bz2 49899 RMD160 aefd1b94a027907b81dd0b4fe7376a8a2a1d3d1a SHA1 994432b3dab7d44985c4cf87f18ec4c42e648915 SHA256 a7da34fe278b51d913610db2f877a88cd47b26e1e64472caa213df8c0d4e69ea
 EBUILD pycups-1.9.49.ebuild 1072 RMD160 d2f209a5c359283ed874fed8f1c33ea18e712e91 SHA1 60ad4709257eebffb1e98b082ff680647e8220b6 SHA256 852456911a316298962e6ae6cbef7294f823a222c18844cf5a2e073c95d2d556
-EBUILD pycups-1.9.53.ebuild 1060 RMD160 514cab15ee9aaed7448c2f9e69a452e2ca2bb4e7 SHA1 d91d93501e2c859b77dde130c23e8233cb1d5b3c SHA256 b500c1465bb4e6239cb00451d780adb7108bb25b46c0b8c9d3a36a47dbdf72de
-MISC ChangeLog 3986 RMD160 9b51f8f3ab919f56a0e83721c7ed62444eebb78b SHA1 cc00196a3b040793a9c33b98f25ec4e500e455d0 SHA256 7863ddca3c68bf3798aca4c3b8c29ab749e9e335fabd764e737ba121333a10aa
+EBUILD pycups-1.9.55.ebuild 1061 RMD160 5f8d46ff4e2b550384dc16d6251c65228f719e84 SHA1 63d2de33e7ef328766130a7a56b40874af934c32 SHA256 c89a559fb910111053e43a64615b72e8323a8c7f53342ce240d2ceac66bb6002
+MISC ChangeLog 4159 RMD160 e809b999a7bd81e92270ecf888f6fda88087ad1c SHA1 cb86c5ff9930fb65e9f9b06afe6968ad7be6264a SHA256 b6993abef711676209de6c868b5acf39ae387079fa22bdfb93f0fedc85510443
 MISC metadata.xml 255 RMD160 51d8dc98e9ab6c14db22c45f710f9ef08cc09277 SHA1 ec115e72bed9f9bd58767d22bca1dacdfc437a5a SHA256 cc9fa5855a5ea71d2bfa30aaa180939f254a8107d7067de88acc6ab82bdc1d35
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk28Pl4ACgkQHB6c3gNBRYdvpACfZ+uoGsUnFuYvqyQ1tHHr7Eya
+bIQAni4JqmIX8afooMAiI+UCV+Gxzu1J
+=e/38
+-----END PGP SIGNATURE-----
diff --git a/dev-python/webob/ChangeLog b/dev-python/webob/ChangeLog
index 043725eddfef..6077197fd81c 100644
--- a/dev-python/webob/ChangeLog
+++ b/dev-python/webob/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/webob
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/ChangeLog,v 1.35 2011/04/29 20:16:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/ChangeLog,v 1.36 2011/04/30 16:52:04 arfrever Exp $
+
+  30 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  webob-1.0.7.ebuild, +files/webob-1.0.7-tests.patch:
+  Fix tests.
 
 *webob-1.0.7 (29 Apr 2011)
 
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 7ceb25da6dd2..d0d9712cfc39 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX webob-1.0.7-tests.patch 768 RMD160 2daa5ef176a5a59ffc5c398c3373a541f16f34fd SHA1 f311cc0f2075a120207c0a84379a77949c18dacb SHA256 da812d5a308adf81f649d9527bc8323a68a45eb06791d5db9cac5a07202673c7
 DIST WebOb-1.0.3.tar.bz2 101017 RMD160 2fd7eb824fc64e7a104b7e15ae28d51725d33fe5 SHA1 e02a2ae659cb8e1ab7fb83078c254e3e49a5f495 SHA256 d8ee075dd4e38b81a752b6712a8006776b87b066343fd119fb54cca6e71d322f
 DIST WebOb-1.0.5.zip 150909 RMD160 90d9f3b8555f112402a7063068e59e495feebfc0 SHA1 2c009bac77d530d71f867f4ce5471d1037762802 SHA256 806e6e7c55a3170bbf016242494f7c77524666682dd95553a2e19a5d03bb6ad8
 DIST WebOb-1.0.6.zip 59981 RMD160 2bbddcaa9b7d4604875b38b14ebfefa70a476907 SHA1 bc4557306799fa850733cce06650ec51fce7d93e SHA256 d4119ff49e01b29aabf752316da74ab6a0397430a32893d701d8f7f2f1519583
@@ -8,23 +9,23 @@ DIST WebOb-1.0.7.zip 193712 RMD160 6c6e62d7757d82ceeefd79356578560de516d4d0 SHA1
 EBUILD webob-1.0.3.ebuild 795 RMD160 10e5eb90b09d45a89962bad7ae42e6b2af8ec624 SHA1 84a720a8f39347df686d12614c83a699638d7d07 SHA256 67c0bd0d556b1b2bdbc577a172f28a9a4a5b5c6bca7241760b1fd62871e5d3bd
 EBUILD webob-1.0.5.ebuild 1249 RMD160 111d80ca2384969227f309992e2dbf7d679275c8 SHA1 3d9f4a18932a8ebf1e1608de1903557e29522dba SHA256 770b9f71572fd5285311c893553bd7fbb03453298f172f1a4abd5ad3c6c6648a
 EBUILD webob-1.0.6.ebuild 750 RMD160 61865ca592f2a336bdcb0e63d5c0cccab6704bb5 SHA1 5e8cc7c3289396cf63789f9a72e152d090ea37c3 SHA256 c53705eebc8de87fad65d0a295fed1c5c5c041552e2eb5c26a81687732242c39
-EBUILD webob-1.0.7.ebuild 1408 RMD160 c13aea33b9f3b87a0001c90517302e1b03789e2f SHA1 a3ba4b93cbeb6aeeab20b51caacfbc3661015d91 SHA256 3d5108fed740f30e3c2a4d7398725977398bd69ab0a10f02bcc03c2c985e8a93
-MISC ChangeLog 4287 RMD160 067b21f20f4643d186aac6ccc3143c3de4a15f2f SHA1 cc5db35a09fb0ac8843cd9548d4d347583468cd3 SHA256 3ed155e03eeb628ea51bcbc3c47792335fde3ad6f3d59e85e99a96b1cc3356f9
+EBUILD webob-1.0.7.ebuild 1351 RMD160 e1971e88e231d63f14467689bad47783dd502bf9 SHA1 9b95ccc0aa0852937de692bd34f68a92754bc62a SHA256 fe5c4c5a1bd382404803c27da209d73f68be778b39286e5f497eacfd304ac3a7
+MISC ChangeLog 4428 RMD160 b8dc0c36f6456faf338d8e989af8c4812735cef6 SHA1 fd2109526e1623c97f04725ce67dc272b0334f56 SHA256 7c273bdc0fae564ed342d90e9c1735523aa58591fc1a9ef21e2112d2fa8b16cd
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNuxySAAoJENgZr6v6gHY0suIQANIusoPkksyuSR0EN0e05Ofm
-QkNVOMMId74c94JcnnOKXBtwX3/ZEYlriBumhxdpgOesN6T35CiLz1svgEEN5Eev
-X1G+OyAsGUn67xjCZPVuX9AB6AFApSfqP7+o3mFWEhApv53Jxzc9mQ5buQucQ+EP
-+NRoYwRNuBHW+ZvG6IxvYsnr7Ndouc7iZpRTDK9K9dtqezUWBeJcElUMm8Kajxl5
-dwoptEu62cLQ5mIlikx9DUQe9nIZvlqaMWSzPBU0d23jY4bFfO7WjyHdXa99EcIM
-yY3vGj/e/a2MBqsMMO0ih/aGKGY/xiN9WVP7GjWYgV/s2Rr2NMbq6sg3ndVs8zXt
-vG4oQwotUa1AaQGNFM/fhVwxO5nxdw1nm7W7v4KZxyjCMnQVx1SBXduK/EGxEMmZ
-jLtzupkqvbANNRH481fI5Gvdsng+4kfxdYmt74XmvCOmnChCJ083QUv+LpNDOpKa
-PytuaOMq34CZLXshb9iabthACE4HqK3QKh+AfTTxpzaq6dJcH819OG1VRJc5JPZU
-DYW3ZQGTtso6tViNo+WD6snjsSw2+K/23fkX4FeTUe/g16u9GmV6kElIhCiALK/4
-PW0MU1HB6OQ2bQHX2YJyjqoiUeBJg190RUDRZohUGY63s3lZHbXWZqKSkoLkQQIS
-WquOWax6K1Vo6kOEvlNp
-=x/PG
+iQIcBAEBAgAGBQJNvD49AAoJENgZr6v6gHY0moMP+wQ1LbwjwLt9sq1h0VSCSeDu
+PAYy/zjuLf37tZSfy+oq0U5x2oWNvNvCWfxXpj8yGLXUhDkDNOgfveoRAxA90fJX
+gVExRBYIOphc5GURPT6Gs43qpuJnMftG3fDe+5n0PTcqGA+xmsJxbXq5AF90QFet
+0GHe42P90tJ5C5HyS9e9yYALtAzK7ufBowujT/paCbLBSZ0mSAgq3pdNnuyyMMzs
+MavzH+Wm+GoKNdUbubmHK/uwJWVsUXTcjLJ21uoK/dbysl5y7ssowAtOcvudTibN
+83rzXlmFftqEeGWLEBWTIUkhFV3j+c9EUPTNoaDcmEEFVy04CrSOLp5Ll57OtDvW
+wOydKlSV06zNe43tLzDCiXsYpFsWWedp2oZj8orInjM0ySdxBP69/+4B/FUSM9H5
+Jn5uAcAlEJ0VlLKlHvxE0OCh4jGeckbkLODOlMkAeVMEwoXNZ8feKcx4+t9gJE8D
+ZYVUJrJIulNUIoSBjdVSlFZ1QO7nOboaHfoCJ2iJwV15D21KUT4pDMc2jqf1eCPW
+SmsxvQ8LR2YdlxJIRIeoz8hcGTia0OQP2R/MiOnmf/OUNa0lPy9pklarPOz/yhsY
+T9pf14KzsTfkufMcRpR0yMPpjnEeFL0fzv7ldbcbpw5PSWmLkoLXPzD+P+v5ADYQ
+AQNfJEgqWgk6voiSqv+j
+=AZ66
 -----END PGP SIGNATURE-----
diff --git a/dev-python/webob/files/webob-1.0.7-tests.patch b/dev-python/webob/files/webob-1.0.7-tests.patch
new file mode 100644
index 000000000000..a86f88c69a93
--- /dev/null
+++ b/dev-python/webob/files/webob-1.0.7-tests.patch
@@ -0,0 +1,27 @@
+https://bitbucket.org/ianb/webob/issue/11
+https://bitbucket.org/ianb/webob/changeset/145b64e724eb
+
+--- tests/test_misc.py
++++ tests/test_misc.py
+@@ -130,7 +130,8 @@
+ 
+ 
+ def test_multidict_cgi():
+-    fs = cgi.FieldStorage()
++    env = {'QUERY_STRING': ''}
++    fs = cgi.FieldStorage(environ=env)
+     fs.filename = '\xc3\xb8'
+     plain = MultiDict(key='\xc3\xb8', fs=fs)
+     ua = UnicodeMultiDict(multi=plain, encoding='utf-8')
+--- tests/test_multidict.py
++++ tests/test_multidict.py
+@@ -187,7 +187,8 @@
+         d = self._get_instance()
+         d.decode_keys = True
+ 
+-        fs = cgi.FieldStorage()
++        env = {'QUERY_STRING': ''}
++        fs = cgi.FieldStorage(environ=env)
+         fs.name = 'a'
+         self.assertEqual(d._decode_value(fs).name, 'a')
+ 
diff --git a/dev-python/webob/webob-1.0.7.ebuild b/dev-python/webob/webob-1.0.7.ebuild
index 1d663eb2fc92..dfc431a56515 100644
--- a/dev-python/webob/webob-1.0.7.ebuild
+++ b/dev-python/webob/webob-1.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/webob-1.0.7.ebuild,v 1.1 2011/04/29 20:16:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/webob-1.0.7.ebuild,v 1.2 2011/04/30 16:52:04 arfrever Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -8,7 +8,7 @@ SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 DISTUTILS_SRC_TEST="nosetests"
 
-inherit distutils
+inherit distutils eutils
 
 MY_PN="WebOb"
 MY_P="${MY_PN}-${PV}"
@@ -32,9 +32,7 @@ S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	distutils_src_prepare
-
-	# https://bitbucket.org/ianb/webob/issue/11
-	sed -e "s/test_multidict_cgi/_&/" -i tests/test_misc.py
+	epatch "${FILESDIR}/${P}-tests.patch"
 }
 
 src_compile() {