head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.10
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.8
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.6
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.4
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.2
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q2:1.1.0.28
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.26
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.24
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.22
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.20
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.18
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.16
	pkgsrc-2008Q1:1.1.0.14
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.12
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.10
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.8
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.6
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.4
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.2
	pkgsrc-2006Q3-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2009.07.15.06.12.45;	author ver;	state dead;
branches;
next	1.1;

1.1
date	2006.08.26.16.42.25;	author kristerw;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Upgrade devel/py-ZopeInterface to zope.interface-3.3.0.
Use eggs instead of distutils.
Remove patch-aa as it no longer applies.

Add licenses/zpl and add zpl to mk/license.mk:DEFAULT_ACCEPTABLE_LICENSES.

Patch posted to pkgsrc-users@@ and okayed by agc@@.
@
text
@$NetBSD: patch-aa,v 1.1 2006/08/26 16:42:25 kristerw Exp $

Reorder functions to fix "static declaration follows non-static" error
with gcc 4.

--- Dependencies/zope.interface-ZopeInterface-3.0.1/zope.interface/_zope_interface_coptimizations.c.orig	2006-08-26 18:12:52.000000000 +0200
+++ Dependencies/zope.interface-ZopeInterface-3.0.1/zope.interface/_zope_interface_coptimizations.c	2006-08-26 18:19:11.000000000 +0200
@@@@ -24,6 +24,8 @@@@ static PyObject *BuiltinImplementationSp
 static PyObject *str__class__, *str__providedBy__, *strisOrExtends;
 static PyObject *empty, *fallback, *str_implied, *str_cls, *str_implements;
 static PyTypeObject *Implements;
+static PyObject *Spec_providedBy(PyObject *self, PyObject *ob);
+static PyObject *Spec_implementedBy(PyObject *self, PyObject *cls);
 
 static int imported_declarations = 0;
 
@@@@ -70,7 +72,6 @@@@ import_declarations(void)
   return 0;
 }
 
-extern PyTypeObject SpecType;   /* Forward */
 
 static PyObject *
 implementedByFallback(PyObject *cls)
@@@@ -279,50 +280,10 @@@@ static char Spec_providedBy__doc__[] = 
 "Test whether an interface is implemented by the specification"
 ;
 
-static PyObject *
-Spec_providedBy(PyObject *self, PyObject *ob)
-{
-  PyObject *decl, *item;
-
-  decl = providedBy(NULL, ob);
-  if (decl == NULL)
-    return NULL;
-
-  if (PyObject_TypeCheck(ob, &SpecType))
-    item = Spec_extends(decl, self);
-  else
-    /* decl is probably a security proxy.  We have to go the long way
-       around. 
-    */
-    item = PyObject_CallMethodObjArgs(decl, strisOrExtends, self, NULL);
-
-  Py_DECREF(decl);
-  return item;
-}
-
-
 static char Spec_implementedBy__doc__[] = 
 "Test whether the specification is implemented by instances of a class"
 ;
 
-static PyObject *
-Spec_implementedBy(PyObject *self, PyObject *cls)
-{
-  PyObject *decl, *item;
-
-  decl = implementedBy(NULL, cls);
-  if (decl == NULL)
-    return NULL;
-  
-  if (PyObject_TypeCheck(decl, &SpecType))
-    item = Spec_extends(decl, self);
-  else
-    item = PyObject_CallMethodObjArgs(decl, strisOrExtends, self, NULL);
-
-  Py_DECREF(decl);
-  return item;
-}
-
 static struct PyMethodDef Spec_methods[] = {
 	{"providedBy",  
          (PyCFunction)Spec_providedBy,		METH_O,
@@@@ -370,6 +331,45 @@@@ static PyTypeObject SpecType = {
 };
 
 static PyObject *
+Spec_providedBy(PyObject *self, PyObject *ob)
+{
+  PyObject *decl, *item;
+
+  decl = providedBy(NULL, ob);
+  if (decl == NULL)
+    return NULL;
+
+  if (PyObject_TypeCheck(ob, &SpecType))
+    item = Spec_extends(decl, self);
+  else
+    /* decl is probably a security proxy.  We have to go the long way
+       around. 
+    */
+    item = PyObject_CallMethodObjArgs(decl, strisOrExtends, self, NULL);
+
+  Py_DECREF(decl);
+  return item;
+}
+
+static PyObject *
+Spec_implementedBy(PyObject *self, PyObject *cls)
+{
+  PyObject *decl, *item;
+
+  decl = implementedBy(NULL, cls);
+  if (decl == NULL)
+    return NULL;
+  
+  if (PyObject_TypeCheck(decl, &SpecType))
+    item = Spec_extends(decl, self);
+  else
+    item = PyObject_CallMethodObjArgs(decl, strisOrExtends, self, NULL);
+
+  Py_DECREF(decl);
+  return item;
+}
+
+static PyObject *
 OSD_descr_get(PyObject *self, PyObject *inst, PyObject *cls)
 {
   PyObject *provides;
@


1.1
log
@Fix "static declaration follows non-static" error with gcc 4.
@
text
@d1 1
a1 1
$NetBSD$
@