drop Python-2.4 support -- the Makefile was changed recently to

require 2.5+ (by mistake, but anyway), and it doesn't hurt
because libxcb (our only client) needs 2.5+ now

3 files changed, 1 insertions, 58 deletions

diff --git a/x11/py-xcbgen/distinfo b/x11/py-xcbgen/distinfo
index a9f140625d8..da426921ef1 100644
--- a/x11/py-xcbgen/distinfo
+++ b/x11/py-xcbgen/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.2 2009/05/29 09:26:30 wiz Exp $
+$NetBSD: distinfo,v 1.3 2009/06/18 11:15:47 drochner Exp $
 
 SHA1 (xcb-proto-1.5.tar.bz2) = c3f93ba6b75635c1e9d1accdfa7907f43a0e986f
 RMD160 (xcb-proto-1.5.tar.bz2) = cdf1537134432a32be588b60f15a83d1b40e8cf4
 Size (xcb-proto-1.5.tar.bz2) = 89241 bytes
-SHA1 (patch-aa) = a04e2b8bb3fa6630d47d3febd7d676717ac15907
-SHA1 (patch-ab) = c61982389c86d2a61136aba67ea2a0647cc68da5
 SHA1 (patch-ac) = 39539e6d45e4994df0c291f6c05382c5c00a6aee
 SHA1 (patch-ad) = bb86c889e0520aa98761b01d71d438ca4e71fc6b
 SHA1 (patch-ae) = dc24bb927986f7112367836e6520c30059891686
diff --git a/x11/py-xcbgen/patches/patch-aa b/x11/py-xcbgen/patches/patch-aa
deleted file mode 100644
index 390cc7b0f39..00000000000
--- a/x11/py-xcbgen/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/04/08 13:06:22 drochner Exp $
-
---- configure.orig	2009-01-07 13:20:32.000000000 +0100
-+++ configure
-@@ -2207,7 +2207,7 @@ echo $ECHO_N "checking whether $PYTHON v
-       prog="import sys, string
- # split strings by '.' and convert to numeric.  Append some zeros
- # because we need at least 4 digits for the hex conversion.
--minver = map(int, string.split('2.5', '.')) + [0, 0, 0]
-+minver = map(int, string.split('2.4', '.')) + [0, 0, 0]
- minverhex = 0
- for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i]
- sys.exit(sys.hexversion < minverhex)"
diff --git a/x11/py-xcbgen/patches/patch-ab b/x11/py-xcbgen/patches/patch-ab
deleted file mode 100644
index 5826a798832..00000000000
--- a/x11/py-xcbgen/patches/patch-ab
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/04/08 13:06:22 drochner Exp $
-
---- xcbgen/xtypes.py.orig	2008-09-05 00:49:13.000000000 +0200
-+++ xcbgen/xtypes.py
-@@ -160,12 +160,22 @@ class ListType(Type):
- 
-         if elt.tag == 'list':
-             elts = list(elt)
--            self.expr = Expression(elts[0] if len(elts) else elt, self)
-+	    if len(elts):
-+                self.expr = Expression(elts[0], self)
-+            else:
-+                self.expr = Expression(elt, self)
-         elif elt.tag == 'valueparam':
-             self.expr = Expression(elt, self)
- 
--        self.size = member.size if member.fixed_size() else None
--        self.nmemb = self.expr.nmemb if self.expr.fixed_size() else None
-+        if member.fixed_size():
-+            self.size = member.size
-+        else:
-+            self.size = None
-+
-+        if self.expr.fixed_size():
-+            self.nmemb = self.expr.nmemb
-+        else:
-+            self.nmemb = None
- 
-     def make_member_of(self, module, complex_type, field_type, field_name, visible, wire, auto):
-         if not self.fixed_size():
-@@ -256,7 +266,10 @@ class PadType(SizedPadType):
-     Derived class which represents a padding field of given type.
-     '''
-     def __init__(self, elt):
--        self.nmemb = "1" if (elt == None) else elt.get('bytes')
-+        if (elt == None):
-+            self.nmemb = "1"
-+        else:
-+            self.nmemb = elt.get('bytes')
-         SizedPadType.__init__(self, self.nmemb)
-     
- class ComplexType(Type):