bumped to mocker-1.1.1, new patch for pypy to pass tests, mocker-1.0 dropped, closes Bug 425686

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64

4 files changed, 51 insertions, 11 deletions

diff --git a/dev-python/mocker/ChangeLog b/dev-python/mocker/ChangeLog
index b7e9d0bde554..1bfc03bf9d0e 100644
--- a/dev-python/mocker/ChangeLog
+++ b/dev-python/mocker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/mocker
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mocker/ChangeLog,v 1.6 2011/09/16 08:01:07 djc Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mocker/ChangeLog,v 1.7 2012/11/03 18:24:32 idella4 Exp $
+
+*mocker-1.1.1 (04 Nov 2012)
+
+  04 Nov 2012; Ian Delaney <idella4@gentoo.org>
+  +files/mocker-1.1.1-pypy_test.patch, +mocker-1.1.1.ebuild, -mocker-1.0.ebuild:
+  bumped to mocker-1.1.1, new patch for pypy to pass tests, mocker-1.0 dropped,
+  closes Bug 425686
 
 *mocker-1.1 (16 Sep 2011)
 
@@ -29,4 +36,3 @@
   +mocker-0.10.1.ebuild:
   Initial commit, ebuild by Maciej Blizinski <maciej.blizinski@gmail.com> -
   thanks, Maciej. bug #214433
-
diff --git a/dev-python/mocker/Manifest b/dev-python/mocker/Manifest
index 0d0c80c94d90..19a2fd96722e 100644
--- a/dev-python/mocker/Manifest
+++ b/dev-python/mocker/Manifest
@@ -1,6 +1,7 @@
-DIST mocker-1.0.tar.bz2 34010 SHA256 8b14b75c3942ccc589159871c64bd3d9b7086d9d183e1fa98e301425a38fc77e SHA512 3ce2e0abbb70e89b9bed493ee9c2611047001da7de32d45e540ac8034769c564f04328e4ecbd6a452940dabd1af03e25b505e47491f9466d338eb5e130b353dd WHIRLPOOL 5cc56b95f87915184b85043b665c95444302e7d9175ee784145836f601fd1cf58f688bd9380d41c090570d0ed4bb3b4fd0ac8e92b405172a07c6eaa668438d0f
+AUX mocker-1.1.1-pypy_test.patch 1380 SHA256 432470af0be4b86cfb01b8baf96cc617fcc043950f45274b467a5df43771852d SHA512 cbbda1c8903658332f7a391c7be547d62d64c5b149c2d92434558415dafc0c68686d5210ba814ba5edb42987f04e51cb8e5ee10e3a31684560a0856f9aba81c0 WHIRLPOOL aaf9e74486a4dc6cf3cc63a6a7d7d226f794e67b0ab64ba8bc6ca8aa67a792dd8c9b42b1e10d17d670133b7af64ad6cbc83d727fe3b362bd4fa7855391a6a29e
+DIST mocker-1.1.1.tar.bz2 36357 SHA256 2009911707c74b28bdc9959b5224717e45fcb93475b4b7bb4efad3285fcf2919 SHA512 79fc08220b932f5e8ec4999a872fd522a71e2d193fb7842a60b164793863d97aefbd5b16469243c323b8ee151a33e1ea18703b7ceaa239c816bc09a3fb7f6825 WHIRLPOOL 29103b97a278575a424ff46f986459d93751a2865fb1eecfa37134053dfdd03e0998f280b44c43d9c9bd4044b7121b20c191e7dc1989790d774eda653f731619
 DIST mocker-1.1.tar.bz2 36144 SHA256 9ee647ede708a3cdcef77134169a056ce044669b9ee99bbc81444cff70d52991 SHA512 7c57414e439e2dc5566898aef21d5053bcfce976dd3423b7ed81cf01eb84b403b849430e104fa6a0a2660acac2677516083045b4e8da138824f805a33915f2ce WHIRLPOOL 71c63599aabfb6a39737fa3229a942038cb539c74b43f208a969f15abcdf8db05114cdbe33079b1ec7f9901a3a8ccb63d95c3978d07ad43e58d6dd4c7e0bf3a0
-EBUILD mocker-1.0.ebuild 826 SHA256 c17ab49976167e51075ddbbf47cac68343ade43bff2b232d4558cf8d4f55d179 SHA512 6ca92eeaf9e5220a32696e605a31934a96e0f69b669766a8dabb35527dd3bfa3a4a39f1c875792206783f92c30d43fef1c84d15447dc9b8a336119ee87998a37 WHIRLPOOL 3b0904966924d9ff89de9ef255acb2ffcf9a9e8052f2b7ad825042a456aef7a8b829d52ea4ac414af72276c9b95b786d218378ed658e028aa43047e7eb4a306d
+EBUILD mocker-1.1.1.ebuild 877 SHA256 2caa2368430590a16a03e226f86129d95d0f2d3c144511792bd2de1d1cc0cb23 SHA512 05c73da7e7843e37f02a75437dcb9fc8963991468493f6b6a42789a27d4dbdb53c36fedd3053bd4601c08f17fda1dff5f4dadae70587be621f14c67449e907df WHIRLPOOL f940a6734a9d486f57e96dbf2928087e717c046feaa5b5d4b93a62eea5fd3738a4d7dafca27d7a02b90cb4c02362d47027a52fc992b6f0cdec4129d64ffe90e5
 EBUILD mocker-1.1.ebuild 821 SHA256 8bd90db9655b6f9345266d081de5dde0eaaf509f1443ba6fafcc99a4cb0f6717 SHA512 1afa616c81e4e6303cfb9f7b344b6c5bd913363cceaef0703b5cfa056c232ea6b2c0c747b1b7caf32c053fb875f6215cc32161cb92d3918add020a9d47172b54 WHIRLPOOL 1830030cb7f4141750119e4886815112f9085f6538f637c1e7739105315208c0c67d2a54c5083922b808b002a7a4936341d93f68320245adabf765b4b376047f
-MISC ChangeLog 1056 SHA256 b09e99861e6c40d5a68b175e62bcf80c88421a8c86703992a40295fba760cdef SHA512 d98985fd1246c6fa115718d623131bf35e937f444aec16e1252b624d42755e8346dc674ec8022b50873bde512713cfc2d75757e5add543f585381e3d5d5ff1f1 WHIRLPOOL b9fffbd18f6e8d0be94337cfdb2689e97a58348a93f7194d7e246ce22a1bc70b5eddcd01344680db8cdc709cf761059f1cb13664ec772874093ef7b01c4db1d9
+MISC ChangeLog 1318 SHA256 9f6345a803bbdfd0b649cc303887393b7e9d755201ae99b708ea984326b065e0 SHA512 bf710d35c073134adaf5fed97b9566e8b9b1b3ee1c972b0a2b89c4401191abfb6aa2d99fa6e4bbaf9153052cc028ae5139a129817f9ffb4044345f87a11e8882 WHIRLPOOL 168957f7032a09f6eb2e5f188a65c727d3ecb431a9f45b00b0e33dba1302384286c457abf1aa69af60b56011f792939564ef063fd1e1e2281ed53e82e2a6a37c
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
diff --git a/dev-python/mocker/files/mocker-1.1.1-pypy_test.patch b/dev-python/mocker/files/mocker-1.1.1-pypy_test.patch
new file mode 100644
index 000000000000..b0036ad6dd11
--- /dev/null
+++ b/dev-python/mocker/files/mocker-1.1.1-pypy_test.patch
@@ -0,0 +1,29 @@
+Upstream maintainer assures us "The "assertRaises" line should be skipped IMO. The next call actually succeeds,
+but of course there is no point to test for unsupported functions."
+Re the 2nd patch;
+PyPy actually behaves as if __slots__ was added to the class
+see http://morepypy.blogspot.ch/2010/11/efficiently-implementing-python-objects.html
+diff -ur mocker-1.1.1.orig/test.py mocker-1.1.1/test.py
+--- test.py	2012-05-19 19:27:02.000000000 +0800
++++ test.py	2012-07-11 14:43:57.848953730 +0800
+@@ -3880,7 +3881,7 @@
+         from zlib import adler32
+         # If that fails, this test has to change because either adler32 has
+         # changed, or the implementation of getargspec has changed.
+-        self.assertRaises(TypeError, inspect.getargspec, adler32)
++       # self.assertRaises(TypeError, inspect.getargspec, adler32)
+         try:
+             task = SpecChecker(adler32)
+             task.run(self.path("asd"))
+@@ -4060,7 +4060,8 @@
+                 self.calendar = calendar
+         obj = C()
+         self.task.replay()
+-        self.assertEquals(type(obj.calendar), Mock)
+-        self.assertTrue(obj.calendar is self.mock)
++        if not hasattr(sys, 'pypy_version_info'):
++            self.assertEquals(type(obj.calendar), Mock)
++            self.assertTrue(obj.calendar is self.mock)
+ 
+     def test_install_on_submodule(self):
+        from os import path
diff --git a/dev-python/mocker/mocker-1.0.ebuild b/dev-python/mocker/mocker-1.1.1.ebuild
index 64ce9cfd8374..15fdb5c74e55 100644
--- a/dev-python/mocker/mocker-1.0.ebuild
+++ b/dev-python/mocker/mocker-1.1.1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mocker/mocker-1.0.ebuild,v 1.1 2010/06/21 18:30:55 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mocker/mocker-1.1.1.ebuild,v 1.1 2012/11/03 18:24:32 idella4 Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="Platform for Python test doubles: mocks, stubs, fakes, and dummies"
 HOMEPAGE="http://labix.org/mocker http://pypi.python.org/pypi/mocker"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
@@ -23,6 +23,10 @@ RDEPEND=""
 
 PYTHON_MODNAME="mocker.py"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pypy_test.patch
+}
+
 src_test() {
 	testing() {
 		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" test.py