Version bump.

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)

2 files changed, 62 insertions, 0 deletions

diff --git a/x11-libs/libxcb/files/libxcb-1.9-python-3-exception.patch b/x11-libs/libxcb/files/libxcb-1.9-python-3-exception.patch
new file mode 100644
index 000000000000..18d8e4477820
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.9-python-3-exception.patch
@@ -0,0 +1,22 @@
+Replace except statement with a PEP-3110 compliant one. This fixes a regression
+introduced by c3deeaf714630531d693a6a902b8dabf791858b1
+https://bugs.freedesktop.org/show_bug.cgi?id=55690
+---
+ src/c_client.py |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/c_client.py b/src/c_client.py
+index 9952a09..ec66223 100644
+--- a/src/c_client.py
++++ b/src/c_client.py
+@@ -2908,7 +2908,7 @@ Refer to the README file in xcb/proto for more info.
+ # Ensure the man subdirectory exists
+ try:
+     os.mkdir('man')
+-except OSError, e:
++except OSError as e:
+     if e.errno != errno.EEXIST:
+         raise
+ 
+-- 
+1.7.8.6
diff --git a/x11-libs/libxcb/files/libxcb-1.9-python-3-iteritems.patch b/x11-libs/libxcb/files/libxcb-1.9-python-3-iteritems.patch
new file mode 100644
index 000000000000..ef58ec8b22a9
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.9-python-3-iteritems.patch
@@ -0,0 +1,40 @@
+This fixes a regression introduced by ea71d7d7e3f5d8189b80747678e9ca9a417b1d37
+https://bugs.freedesktop.org/show_bug.cgi?id=55690
+---
+ src/c_client.py |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/c_client.py b/src/c_client.py
+index 27a01b1..9952a09 100644
+--- a/src/c_client.py
++++ b/src/c_client.py
+@@ -2616,7 +2616,7 @@ def _man_request(self, name, cookie_type, void, aux):
+                 (cookie_type, self.c_reply_name, base_func_name))
+     f.write('.SH ERRORS\n')
+     if hasattr(self, "doc") and self.doc:
+-        for errtype, errtext in self.doc.errors.iteritems():
++        for errtype, errtext in self.doc.errors.items():
+             f.write('.IP \\fI%s\\fP 1i\n' % (_t(('xcb', errtype, 'error'))))
+             errtext = re.sub(r'`([^`]+)`', r'\\fI\1\\fP', errtext)
+             f.write('%s\n' % (errtext))
+@@ -2634,7 +2634,7 @@ def _man_request(self, name, cookie_type, void, aux):
+         see = ['.BR %s (3)' % 'xcb-requests']
+         if self.doc.example:
+             see.append('.BR %s (3)' % 'xcb-examples')
+-        for seename, seetype in self.doc.see.iteritems():
++        for seename, seetype in self.doc.see.items():
+             if seetype == 'program':
+                 see.append('.BR %s (1)' % seename)
+             elif seetype == 'event':
+@@ -2764,7 +2764,7 @@ def _man_event(self, name):
+         see = ['.BR %s (3)' % 'xcb_generic_event_t']
+         if self.doc.example:
+             see.append('.BR %s (3)' % 'xcb-examples')
+-        for seename, seetype in self.doc.see.iteritems():
++        for seename, seetype in self.doc.see.items():
+             if seetype == 'program':
+                 see.append('.BR %s (1)' % seename)
+             elif seetype == 'event':
+-- 
+1.7.8.6
+