summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2011-07-07 07:29:30 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2011-07-07 07:29:30 +0000
commita11a24489635cef6face47a82c07d762b59b4611 (patch)
tree95a888bc7546267e892525ea8f6e1d87812ac27b
parentStable on amd64 wrt bug #374193 (diff)
downloadhistorical-a11a24489635cef6face47a82c07d762b59b4611.tar.gz
historical-a11a24489635cef6face47a82c07d762b59b4611.tar.bz2
historical-a11a24489635cef6face47a82c07d762b59b4611.zip
Remove unneeded files. Requested by Arfrever
Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64
-rw-r--r--dev-python/decorator/ChangeLog6
-rw-r--r--dev-python/decorator/files/decorator-3.3.0-python-3.2.patch22
-rw-r--r--dev-python/pygame/ChangeLog6
-rw-r--r--dev-python/pygame/files/config.patch26
-rw-r--r--dev-python/pygame/files/pygame-1.9.1-linux-headers-2.6.38.patch63
-rw-r--r--dev-python/pytest/ChangeLog6
-rw-r--r--dev-python/pytest/files/pytest-2.0.0-nose-1.0+python-3.patch129
7 files changed, 15 insertions, 243 deletions
diff --git a/dev-python/decorator/ChangeLog b/dev-python/decorator/ChangeLog
index d18d83d90935..b640be2fc74e 100644
--- a/dev-python/decorator/ChangeLog
+++ b/dev-python/decorator/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/decorator
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/decorator/ChangeLog,v 1.44 2011/07/01 21:27:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/decorator/ChangeLog,v 1.45 2011/07/07 07:27:46 hwoarang Exp $
+
+ 07 Jul 2011; Markos Chandras <hwoarang@gentoo.org>
+ -files/decorator-3.3.0-python-3.2.patch:
+ Remove unneeded files. Requested by Arfrever
01 Jul 2011; Markos Chandras <hwoarang@gentoo.org> -decorator-3.3.0.ebuild:
Remove old ebuilds. Requested by Arfrever
diff --git a/dev-python/decorator/files/decorator-3.3.0-python-3.2.patch b/dev-python/decorator/files/decorator-3.3.0-python-3.2.patch
deleted file mode 100644
index 6e9eb851bea5..000000000000
--- a/dev-python/decorator/files/decorator-3.3.0-python-3.2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://code.google.com/p/micheles/source/detail?r=929b7bda62b98489f2d9952b1ef6046ce27c1704
-
---- documentation3.py
-+++ documentation3.py
-@@ -660,7 +660,7 @@
-
- .. code-block:: python
-
-- >>> f()
-+ >>> f() # doctest: +ELLIPSIS
- Traceback (most recent call last):
- ...
- File "<string>", line 2, in f
-@@ -668,7 +668,7 @@
- return f(*args, **kw)
- File "<doctest __main__[51]>", line 3, in f
- 1/0
-- ZeroDivisionError: int division or modulo by zero
-+ ZeroDivisionError: ...
-
- You see here the inner call to the decorator ``trace``, which calls
- ``f(*args, **kw)``, and a reference to ``File "<string>", line 2, in f``.
diff --git a/dev-python/pygame/ChangeLog b/dev-python/pygame/ChangeLog
index 8e162b0b745d..d14fee722df4 100644
--- a/dev-python/pygame/ChangeLog
+++ b/dev-python/pygame/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/pygame
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.79 2011/07/01 21:28:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.80 2011/07/07 07:28:43 hwoarang Exp $
+
+ 07 Jul 2011; Markos Chandras <hwoarang@gentoo.org>
+ -files/pygame-1.9.1-linux-headers-2.6.38.patch, -files/config.patch:
+ Remove unneeded files. Requested by Arfrever
01 Jul 2011; Markos Chandras <hwoarang@gentoo.org> -pygame-1.9.1.ebuild,
-pygame-1.9.1-r1.ebuild:
diff --git a/dev-python/pygame/files/config.patch b/dev-python/pygame/files/config.patch
deleted file mode 100644
index b3dab162ce0e..000000000000
--- a/dev-python/pygame/files/config.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: config_unix.py
-===================================================================
---- config_unix.py (revision 2567)
-+++ config_unix.py (working copy)
-@@ -174,7 +174,7 @@
-
- for d in DEPS[1:]:
- if not d.found:
-- if not confirm("""
-+ if "-auto" not in sys.argv and not confirm("""
- Warning, some of the pygame dependencies were not found. Pygame can still
- compile and install, but games that depend on those missing dependencies
- will not run. Would you like to continue the configuration?"""):
-Index: config_msys.py
-===================================================================
---- config_msys.py (revision 2567)
-+++ config_msys.py (working copy)
-@@ -283,7 +283,7 @@
-
- for d in DEPS[1:]:
- if not d.found:
-- if not confirm("""
-+ if "-auto" not in sys.argv and not confirm("""
- Warning, some of the pygame dependencies were not found. Pygame can still
- compile and install, but games that depend on those missing dependencies
- will not run. Would you like to continue the configuration?"""):
diff --git a/dev-python/pygame/files/pygame-1.9.1-linux-headers-2.6.38.patch b/dev-python/pygame/files/pygame-1.9.1-linux-headers-2.6.38.patch
deleted file mode 100644
index f300c6efe157..000000000000
--- a/dev-python/pygame/files/pygame-1.9.1-linux-headers-2.6.38.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- Setup.in
-+++ Setup.in
-@@ -34,7 +34,7 @@
- _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
- movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
- scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
--_camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
-+_camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
- pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
-
- GFX = src/SDL_gfx/SDL_gfxPrimitives.c
---- src/_camera.c
-+++ src/_camera.c
-@@ -160,20 +160,8 @@
- {
- #if defined(__unix__)
- if (v4l2_open_device(self) == 0) {
-- if (v4l_open_device(self) == 0) {
-- v4l2_close_device(self);
-- return NULL;
-- } else {
-- self->camera_type = CAM_V4L;
-- if (v4l_init_device(self) == 0) {
-- v4l2_close_device(self);
-- return NULL;
-- }
-- if (v4l_start_capturing(self) == 0) {
-- v4l2_close_device(self);
-- return NULL;
-- }
-- }
-+ v4l2_close_device(self);
-+ return NULL;
- } else {
- self->camera_type = CAM_V4L2;
- if (v4l2_init_device(self) == 0) {
---- src/camera.h
-+++ src/camera.h
-@@ -39,7 +39,6 @@
-
- #include <asm/types.h> /* for videodev2.h */
-
-- #include <linux/videodev.h>
- #include <linux/videodev2.h>
- #endif
-
-@@ -51,7 +50,6 @@
- #define RGB_OUT 1
- #define YUV_OUT 2
- #define HSV_OUT 4
--#define CAM_V4L 1
- #define CAM_V4L2 2
-
- struct buffer
-@@ -111,8 +109,4 @@
- int v4l2_close_device (PyCameraObject* self);
- int v4l2_open_device (PyCameraObject* self);
-
--/* internal functions specific to v4l */
--int v4l_open_device (PyCameraObject* self);
--int v4l_init_device(PyCameraObject* self);
--int v4l_start_capturing(PyCameraObject* self);
- #endif
diff --git a/dev-python/pytest/ChangeLog b/dev-python/pytest/ChangeLog
index da4f242c2d87..16d3aa893f5e 100644
--- a/dev-python/pytest/ChangeLog
+++ b/dev-python/pytest/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/pytest
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.27 2011/07/03 09:13:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytest/ChangeLog,v 1.28 2011/07/07 07:29:30 hwoarang Exp $
+
+ 07 Jul 2011; Markos Chandras <hwoarang@gentoo.org>
+ -files/pytest-2.0.0-nose-1.0+python-3.patch:
+ Remove unneeded files. Requested by Arfrever
03 Jul 2011; Markos Chandras <hwoarang@gentoo.org> pytest-2.0.3.ebuild:
Stable on amd64 wrt bug #373363
diff --git a/dev-python/pytest/files/pytest-2.0.0-nose-1.0+python-3.patch b/dev-python/pytest/files/pytest-2.0.0-nose-1.0+python-3.patch
deleted file mode 100644
index aa4a987311d5..000000000000
--- a/dev-python/pytest/files/pytest-2.0.0-nose-1.0+python-3.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-https://bitbucket.org/hpk42/pytest/changeset/98eb11d8887b
-
---- testing/test_nose.py
-+++ testing/test_nose.py
-@@ -6,7 +6,9 @@
- def test_nose_setup(testdir):
- p = testdir.makepyfile("""
- l = []
-+ from nose.tools import with_setup
-
-+ @with_setup(lambda: l.append(1), lambda: l.append(2))
- def test_hello():
- assert l == [1]
-
-@@ -24,6 +26,8 @@
-
- def test_nose_setup_func(testdir):
- p = testdir.makepyfile("""
-+ from nose.tools import with_setup
-+
- l = []
-
- def my_setup():
-@@ -34,16 +38,15 @@
- b = 2
- l.append(b)
-
-+ @with_setup(my_setup, my_teardown)
- def test_hello():
-- print l
-+ print (l)
- assert l == [1]
-
- def test_world():
-- print l
-+ print (l)
- assert l == [1,2]
-
-- test_hello.setup = my_setup
-- test_hello.teardown = my_teardown
- """)
- result = testdir.runpytest(p, '-p', 'nose')
- result.stdout.fnmatch_lines([
-@@ -53,25 +56,25 @@
-
- def test_nose_setup_func_failure(testdir):
- p = testdir.makepyfile("""
-- l = []
-+ from nose.tools import with_setup
-
-+ l = []
- my_setup = lambda x: 1
- my_teardown = lambda x: 2
-
-+ @with_setup(my_setup, my_teardown)
- def test_hello():
-- print l
-+ print (l)
- assert l == [1]
-
- def test_world():
-- print l
-+ print (l)
- assert l == [1,2]
-
-- test_hello.setup = my_setup
-- test_hello.teardown = my_teardown
- """)
- result = testdir.runpytest(p, '-p', 'nose')
- result.stdout.fnmatch_lines([
-- "*TypeError: <lambda>() takes exactly 1 argument (0 given)*"
-+ "*TypeError: <lambda>() takes exactly 1*0 given*"
- ])
-
-
-@@ -83,11 +86,11 @@
- my_teardown = 2
-
- def test_hello():
-- print l
-+ print (l)
- assert l == [1]
-
- def test_world():
-- print l
-+ print (l)
- assert l == [1,2]
-
- test_hello.setup = my_setup
-@@ -118,11 +121,11 @@
- my_teardown_partial = partial(my_teardown, 2)
-
- def test_hello():
-- print l
-+ print (l)
- assert l == [1]
-
- def test_world():
-- print l
-+ print (l)
- assert l == [1,2]
-
- test_hello.setup = my_setup_partial
-@@ -173,21 +176,21 @@
-
- class TestClass(object):
- def setup(self):
-- print "setup called in", self
-+ print ("setup called in %s" % self)
- self.called = ['setup']
-
- def teardown(self):
-- print "teardown called in", self
-+ print ("teardown called in %s" % self)
- eq_(self.called, ['setup'])
- self.called.append('teardown')
-
- def test(self):
-- print "test called in", self
-+ print ("test called in %s" % self)
- for i in range(0, 5):
- yield self.check, i
-
- def check(self, i):
-- print "check called in", self
-+ print ("check called in %s" % self)
- expect = ['setup']
- #for x in range(0, i):
- # expect.append('setup')