- Update lang/python26 and make Python 2.6.2 to the default Python version

Tested by:	3 pointyhat runs
Thanks to:	pav, gahr, lwhsu, mva, amdmi3

24 files changed, 413 insertions, 269 deletions

diff --git a/devel/aap/Makefile b/devel/aap/Makefile
index 651029e5e41d..4028e654c3e7 100644
--- a/devel/aap/Makefile
+++ b/devel/aap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	aap
 PORTVERSION=	1.090
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	a-a-p
@@ -29,6 +30,12 @@ FULLDOCS=yes
 FULLDOCS=no
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_VER} >= 2.5
+EXTRA_PATCHES=	${FILESDIR}/extra-Sign.py
+.endif
+
 do-install:
 	@cd ${WRKSRC} && \
 		${PYTHON_CMD} ./aap PREFIX="${PREFIX}" FULLDOCS=${FULLDOCS} \
@@ -41,4 +48,4 @@ test: install
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX}|${SED} -E 's,.*share/nls/.+$$,,g;s,${PORTVERSION},%%PORTVERSION%%,g;s,^(lib/aap/Exec-%%PORTVERSION%%/doc/),%%PORTDOCS%%\1,g;s,^share/doc/aap/.*,,g'|${TR} -s '\n') > temp-pkg-plist
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/aap/files/extra-Sign.py b/devel/aap/files/extra-Sign.py
new file mode 100644
index 000000000000..18c12c39725a
--- /dev/null
+++ b/devel/aap/files/extra-Sign.py
@@ -0,0 +1,40 @@
+--- Sign.py.orig	2009-05-27 14:09:55.000000000 +0200
++++ Sign.py	2009-05-27 14:13:27.000000000 +0200
+@@ -11,7 +11,7 @@
+ import os
+ import os.path
+ import string
+-import md5
++import hashlib
+ import time
+ 
+ from Util import *
+@@ -272,7 +272,7 @@
+ 
+     try:
+         f = open(fname, "rb")
+-        m = md5.new()
++        m = hashlib.md5()
+         while 1:
+             # Read big blocks at a time for speed, but don't read the whole
+             # file at once to reduce memory usage.
+@@ -301,7 +301,7 @@
+                                                              % fname) + str(e))
+         return "unknown"
+ 
+-    m = md5.new()
++    m = hashlib.md5()
+ 
+     inquote = 0
+     incomment = 0
+@@ -404,7 +404,9 @@
+ 
+ def buildcheckstr2sign(str):
+     """Compute a signature from a string for the buildcheck."""
+-    return hexdigest(md5.new(str))
++    m = hashlib.md5()
++    m.update(str)
++    return hexdigest(m)
+ 
+ 
+ def _sign_lookup(signatures, name, key):
diff --git a/devel/aap/files/patch-Filetype.py b/devel/aap/files/patch-Filetype.py
new file mode 100644
index 000000000000..4fa4f1f71f23
--- /dev/null
+++ b/devel/aap/files/patch-Filetype.py
@@ -0,0 +1,35 @@
+--- Filetype.py.orig	2009-05-14 15:19:42.000000000 +0200
++++ Filetype.py	2009-05-14 15:20:50.000000000 +0200
+@@ -1414,12 +1414,12 @@
+             rline = items[1]
+         rline_len = len(rline)
+         # isolate first argument, which may be in quotes
+-        as = 0
+-        if as < rline_len:
+-            if rline[as] == '"' or rline[as] == "'":
+-                quote = rline[as]
+-                as = as + 1
+-                ae = as
++        vas = 0
++        if vas < rline_len:
++            if rline[vas] == '"' or rline[vas] == "'":
++                quote = rline[vas]
++                vas = vas + 1
++                ae = vas
+                 while ae < rline_len and rline[ae] != quote:
+                     ae = ae + 1
+                 if ae == rline_len:
+@@ -1427,11 +1427,11 @@
+                                            % (line_idx + recipe_line_nr, line))
+                 n = ae + 1
+             else:
+-                ae = as
++                ae = vas
+                 while ae < rline_len and rline[ae] != ' ' and rline[ae] != '\t':
+                     ae = ae + 1
+                 n = ae
+-            arg1 = rline[as:ae]
++            arg1 = rline[vas:ae]
+         else:
+             arg1 = ''
+             n = rline_len
diff --git a/devel/gaphor/Makefile b/devel/gaphor/Makefile
index 1594517d8c1e..2134bc585957 100644
--- a/devel/gaphor/Makefile
+++ b/devel/gaphor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gaphor
 PORTVERSION=	0.9.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/gaphor/pkg-plist b/devel/gaphor/pkg-plist
index 889706f35c91..e481d87df5c2 100644
--- a/devel/gaphor/pkg-plist
+++ b/devel/gaphor/pkg-plist
@@ -442,8 +442,6 @@ bin/gaphorconvert
 %%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/request.pyc
 %%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/request.pyo
 %%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_adapter.py
-%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_adapter.pyc
-%%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_adapter.pyo
 %%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_api.py
 %%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_api.pyc
 %%PYTHON_SITELIBDIR%%/zope/component/bbb/tests/test_api.pyo
@@ -502,8 +500,6 @@ bin/gaphorconvert
 %%PYTHON_SITELIBDIR%%/zope/interface/_flatten.pyc
 %%PYTHON_SITELIBDIR%%/zope/interface/_flatten.pyo
 %%PYTHON_SITELIBDIR%%/zope/interface/adapter.py
-%%PYTHON_SITELIBDIR%%/zope/interface/adapter.pyc
-%%PYTHON_SITELIBDIR%%/zope/interface/adapter.pyo
 %%PYTHON_SITELIBDIR%%/zope/interface/advice.py
 %%PYTHON_SITELIBDIR%%/zope/interface/advice.pyc
 %%PYTHON_SITELIBDIR%%/zope/interface/advice.pyo
diff --git a/devel/libopensync/Makefile b/devel/libopensync/Makefile
index 2be8637047ea..0513a16e9003 100644
--- a/devel/libopensync/Makefile
+++ b/devel/libopensync/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libopensync
 PORTVERSION=	0.36
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.opensync.org/download/releases/${PORTVERSION}/
 
@@ -27,6 +27,7 @@ CMAKE_USE_PTHREAD=	yes
 USE_GNOME=	glib20 libxml2
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
+CMAKE_ARGS+=	-DPYTHON_INCLUDE_PATH:PATH=${PYTHON_INCLUDEDIR}
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/libopensync/pkg-plist b/devel/libopensync/pkg-plist
index 12aca52e90ec..d0fd11f6f8ac 100644
--- a/devel/libopensync/pkg-plist
+++ b/devel/libopensync/pkg-plist
@@ -85,8 +85,6 @@ share/opensync-1.0/cmake/modules/OpenSyncPackaging.cmake
 share/opensync-1.0/cmake/modules/OpenSyncTesting.cmake
 share/opensync-1.0/cmake/modules/OpenSyncPlugin.cmake
 share/opensync-1.0/cmake/modules/OpenSyncInternal.cmake
-%%PYTHON_SITELIBDIR%%/_opensync.so
-%%PYTHON_SITELIBDIR%%/opensync.py
 @dirrm share/opensync-1.0/schemas
 @dirrm share/opensync-1.0/descriptions
 @dirrm share/opensync-1.0/cmake/modules
diff --git a/devel/nx/Makefile b/devel/nx/Makefile
index b6d7521798a5..bc818173bfa8 100644
--- a/devel/nx/Makefile
+++ b/devel/nx/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	nx
 PORTVERSION=	0.37
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://networkx.lanl.gov/download/networkx/
 DISTNAME=	networkx-${PORTVERSION}
@@ -27,6 +28,7 @@ USE_PYTHON=	2.3+
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	networkx
 PORTDOCS=	*
+PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
 
 post-install:
 .ifndef(NOPORTDOCS)
diff --git a/devel/nx/pkg-plist b/devel/nx/pkg-plist
index 9930a6e59bf5..2ddc3ad30a6f 100644
--- a/devel/nx/pkg-plist
+++ b/devel/nx/pkg-plist
@@ -1,250 +1,250 @@
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/__init__.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/centrality.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cliques.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cluster.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/component.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/convert.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cores.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/dag.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/digraph.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/distance.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/exception.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/function.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/graph.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/hybrid.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/info.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/isomorph.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/isomorphvf2.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/matching.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/operators.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/path.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/release.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/search.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/spectrum.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tree.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/threshold.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/ubigraph.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/utils.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/xdigraph.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/xgraph.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/__init__.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/centrality.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cliques.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cluster.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/component.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/convert.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cores.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/dag.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/digraph.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/distance.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/exception.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/function.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/graph.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/hybrid.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/info.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/isomorph.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/isomorphvf2.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/matching.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/__init__.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/layout.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_agraph.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_pydot.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_pylab.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_vtk.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/__init__.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/layout.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_agraph.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_pydot.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_pylab.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_vtk.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/__init__.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/layout.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_agraph.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_pydot.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_pylab.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing/nx_vtk.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/operators.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/path.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/release.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/search.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/spectrum.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tree.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/threshold.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/ubigraph.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/utils.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/xdigraph.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/xgraph.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/__init__.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/atlas.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/bipartite.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/classic.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/degree_seq.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/directed.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/geometric.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/random_graphs.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/small.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/__init__.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/atlas.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/bipartite.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/classic.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/degree_seq.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/directed.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/geometric.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/random_graphs.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/small.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/__init__.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/atlas.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/bipartite.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/classic.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/degree_seq.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/directed.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/geometric.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/random_graphs.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators/small.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/__init__.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/adjlist.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/edgelist.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/gml.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/gpickle.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/graphml.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/leda.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/nx_yaml.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/p2g.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/pajek.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/sparsegraph6.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/__init__.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/adjlist.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/edgelist.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/gml.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/gpickle.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/graphml.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/leda.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/nx_yaml.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/p2g.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/pajek.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/sparsegraph6.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/__init__.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/adjlist.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/edgelist.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/gml.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/gpickle.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/graphml.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/leda.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/nx_yaml.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/p2g.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/pajek.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite/sparsegraph6.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/benchmark.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/test.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/centrality.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/cliques.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/cluster.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/component.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/convert.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/convert_numpy.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/convert_scipy.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/cores.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/dag.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/digraph_DiGraph.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/distance.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/exception.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/forest.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/function.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/graph_Graph.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/hybrid.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/isomorph.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/isomorphvf2.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/__init__.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/layout.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/nx_agraph.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/nx_pydot.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/nx_pygraphviz.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/nx_pylab.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/__init__.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing/__init__.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/matching.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/operators.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/search.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/shortest_path.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/spectrum.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/threshold.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/tree.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/utils.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/xdigraph_XDiGraph.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/xgraph_XGraph.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/xgraph_XGraph_multiedges_selfloops.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/benchmark.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/test.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/__init__.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/atlas.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/bipartite.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/classic.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/degree_seq.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/directed.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/geometric.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/random_graphs.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/small.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/__init__.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators/__init__.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/__init__.py
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/adjlist.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/edgelist.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/gml.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/gpickle.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/graphml.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/leda.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/nx_yaml.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/p2g.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/pajek.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/sparsegraph6.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/__init__.pyc
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite/__init__.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/benchmark.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/test.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/__init__.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/centrality.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cliques.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cluster.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/component.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/convert.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/cores.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/dag.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/digraph.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/distance.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/exception.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/function.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/graph.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/hybrid.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/info.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/isomorph.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/isomorphvf2.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/matching.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/operators.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/path.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/release.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/search.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/spectrum.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tree.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/threshold.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/ubigraph.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/utils.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/xdigraph.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/xgraph.pyo
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/EGG-INFO/not-zip-safe
-@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/readwrite
-@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/generators
-@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests/drawing
-@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/tests
-@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/readwrite
-@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/generators
-@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx/drawing
-@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/networkx
-@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py2.5.egg
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py2.6.egg/networkx/__init__.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/centrality.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cliques.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cluster.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/component.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/convert.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cores.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/dag.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/digraph.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/distance.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/exception.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/function.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/graph.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/hybrid.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/info.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/isomorph.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/isomorphvf2.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/matching.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/operators.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/path.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/release.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/search.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/spectrum.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tree.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/threshold.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/ubigraph.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/utils.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/xdigraph.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/xgraph.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/__init__.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/centrality.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cliques.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cluster.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/component.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/convert.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cores.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/dag.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/digraph.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/distance.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/exception.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/function.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/graph.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/hybrid.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/info.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/isomorph.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/isomorphvf2.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/matching.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/__init__.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/layout.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_agraph.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_pydot.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_pylab.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_vtk.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/__init__.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/layout.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_agraph.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_pydot.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_pylab.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_vtk.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/__init__.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/layout.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_agraph.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_pydot.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_pylab.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing/nx_vtk.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/operators.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/path.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/release.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/search.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/spectrum.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tree.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/threshold.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/ubigraph.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/utils.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/xdigraph.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/xgraph.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/__init__.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/atlas.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/bipartite.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/classic.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/degree_seq.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/directed.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/geometric.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/random_graphs.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/small.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/__init__.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/atlas.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/bipartite.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/classic.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/degree_seq.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/directed.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/geometric.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/random_graphs.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/small.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/__init__.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/atlas.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/bipartite.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/classic.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/degree_seq.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/directed.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/geometric.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/random_graphs.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators/small.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/__init__.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/adjlist.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/edgelist.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/gml.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/gpickle.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/graphml.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/leda.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/nx_yaml.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/p2g.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/pajek.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/sparsegraph6.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/__init__.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/adjlist.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/edgelist.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/gml.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/gpickle.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/graphml.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/leda.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/nx_yaml.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/p2g.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/pajek.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/sparsegraph6.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/__init__.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/adjlist.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/edgelist.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/gml.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/gpickle.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/graphml.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/leda.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/nx_yaml.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/p2g.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/pajek.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite/sparsegraph6.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/__init__.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/benchmark.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/test.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/centrality.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/cliques.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/cluster.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/component.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/convert.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/convert_numpy.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/convert_scipy.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/cores.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/dag.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/digraph_DiGraph.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/distance.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/exception.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/forest.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/function.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/graph_Graph.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/hybrid.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/isomorph.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/isomorphvf2.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/__init__.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/layout.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/nx_agraph.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/nx_pydot.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/nx_pygraphviz.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/nx_pylab.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/__init__.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing/__init__.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/matching.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/operators.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/search.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/shortest_path.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/spectrum.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/threshold.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/tree.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/utils.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/xdigraph_XDiGraph.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/xgraph_XGraph.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/xgraph_XGraph_multiedges_selfloops.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/__init__.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/benchmark.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/test.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/__init__.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/atlas.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/bipartite.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/classic.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/degree_seq.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/directed.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/geometric.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/random_graphs.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/small.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/__init__.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators/__init__.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/__init__.py
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/adjlist.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/edgelist.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/gml.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/gpickle.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/graphml.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/leda.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/nx_yaml.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/p2g.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/pajek.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/sparsegraph6.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/__init__.pyc
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite/__init__.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/benchmark.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/test.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/__init__.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/centrality.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cliques.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cluster.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/component.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/convert.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/cores.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/dag.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/digraph.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/distance.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/exception.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/function.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/graph.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/hybrid.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/info.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/isomorph.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/isomorphvf2.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/matching.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/operators.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/path.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/release.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/search.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/spectrum.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tree.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/threshold.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/ubigraph.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/utils.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/xdigraph.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/xgraph.pyo
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/EGG-INFO/not-zip-safe
+@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/readwrite
+@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/generators
+@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests/drawing
+@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/tests
+@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/readwrite
+@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/generators
+@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx/drawing
+@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/networkx
+@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/networkx-0.37-py%%PYTHON_VER%%.egg
diff --git a/devel/py-parsing/Makefile b/devel/py-parsing/Makefile
index d8cdfcd7b203..d785cc208f3d 100644
--- a/devel/py-parsing/Makefile
+++ b/devel/py-parsing/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	parsing
 PORTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	SF/pyparsing
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-parsing/pkg-plist b/devel/py-parsing/pkg-plist
index 38d1c30a6d4c..cf09e6bf32c9 100644
--- a/devel/py-parsing/pkg-plist
+++ b/devel/py-parsing/pkg-plist
@@ -2,6 +2,8 @@
 %%PYTHON_SITELIBDIR%%/pyparsing.pyc
 %%PYTHON_SITELIBDIR%%/pyparsing.pyo
 %%PYTHON_SITELIBDIR%%/pyparsing_py3.py
+%%PYTHON_SITELIBDIR%%/pyparsing_py3.pyc
+%%PYTHON_SITELIBDIR%%/pyparsing_py3.pyo
 %%PORTDOCS%%%%DOCSDIR%%/api-objects.txt
 %%PORTDOCS%%%%DOCSDIR%%/class-tree.html
 %%PORTDOCS%%%%DOCSDIR%%/crarr.png
diff --git a/devel/py-pmock/Makefile b/devel/py-pmock/Makefile
index 8cec085b759e..88346b3aed61 100644
--- a/devel/py-pmock/Makefile
+++ b/devel/py-pmock/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	pmock
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	pmock
diff --git a/devel/py-pmock/pkg-plist b/devel/py-pmock/pkg-plist
index d0111c4553ba..d8a072047f08 100644
--- a/devel/py-pmock/pkg-plist
+++ b/devel/py-pmock/pkg-plist
@@ -1,6 +1,4 @@
 %%PYTHON_SITELIBDIR%%/pmock.py
-%%PYTHON_SITELIBDIR%%/pmock.pyc
-%%PYTHON_SITELIBDIR%%/pmock.pyo
 %%PORTDOCS%%%%EXAMPLESDIR%%/errors.py
 %%PORTDOCS%%%%EXAMPLESDIR%%/greeting.py
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
diff --git a/devel/py-ruledispatch/Makefile b/devel/py-ruledispatch/Makefile
index f35f7a8cc967..544beecb8f23 100644
--- a/devel/py-ruledispatch/Makefile
+++ b/devel/py-ruledispatch/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	RuleDispatch
 PORTVERSION=	0.5.a1.r2506
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://nivi.interfree.it/distfiles/${PORTNAME}/ \
 		http://peak.telecommunity.com/snapshots/
diff --git a/devel/py-ruledispatch/files/patch-src-dispatch___init__.py b/devel/py-ruledispatch/files/patch-src-dispatch___init__.py
new file mode 100644
index 000000000000..58ce9f28ffd6
--- /dev/null
+++ b/devel/py-ruledispatch/files/patch-src-dispatch___init__.py
@@ -0,0 +1,20 @@
+--- src/dispatch/__init__.py.orig	2009-05-14 22:55:09.000000000 +0200
++++ src/dispatch/__init__.py	2009-05-14 22:55:45.000000000 +0200
+@@ -95,7 +95,7 @@
+     return decorate_assignment(callback)
+ 
+ 
+-def as(*decorators):
++def fas(*decorators):
+     """Use Python 2.4 decorators w/Python 2.2+
+ 
+     Example:
+@@ -103,7 +103,7 @@
+         import dispatch
+ 
+         class Foo(object):
+-            [dispatch.as(classmethod)]
++            [dispatch.fas(classmethod)]
+             def something(cls,etc):
+                 \"""This is a classmethod\"""
+     """
diff --git a/devel/py-ruledispatch/files/patch-src-dispatch_predicates.py b/devel/py-ruledispatch/files/patch-src-dispatch_predicates.py
new file mode 100644
index 000000000000..645e1a10157b
--- /dev/null
+++ b/devel/py-ruledispatch/files/patch-src-dispatch_predicates.py
@@ -0,0 +1,29 @@
+--- src/dispatch/predicates.py.orig	2009-05-14 22:55:57.000000000 +0200
++++ src/dispatch/predicates.py	2009-05-14 22:56:15.000000000 +0200
+@@ -236,7 +236,7 @@
+ 
+         return or_, (EXPR_GETTER_ID,)
+ 
+-    [as(classmethod)]
++    [fas(classmethod)]
+     def immediate(klass,seq):
+         for item in seq:
+             if item:
+@@ -260,7 +260,7 @@
+ 
+         return and_, (EXPR_GETTER_ID,)
+ 
+-    [as(classmethod)]
++    [fas(classmethod)]
+     def immediate(klass,seq):
+         for item in seq:
+             if not item:
+@@ -278,7 +278,7 @@
+             return get(argIds[2])
+         return ifelse, (EXPR_GETTER_ID,)
+ 
+-    [as(classmethod)]
++    [fas(classmethod)]
+     def immediate(klass,seq):
+         if seq[1]: return seq[0]
+         return seq[2]
diff --git a/devel/py-shapely/Makefile b/devel/py-shapely/Makefile
index 9d84fc6246c1..7b6d704dd0e8 100644
--- a/devel/py-shapely/Makefile
+++ b/devel/py-shapely/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Python Package for Manipulation 2D Geospatial Geometry
 
 LIB_DEPENDS=	geos_c.6:${PORTSDIR}/graphics/geos
 
-USE_PYTHON=	2.5
+USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	easy_install
 
 .include <bsd.port.mk>
diff --git a/devel/py-simpleparse/Makefile b/devel/py-simpleparse/Makefile
index 16d80d56b82a..8d12073e963e 100644
--- a/devel/py-simpleparse/Makefile
+++ b/devel/py-simpleparse/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	simpleparse
 PORTVERSION=	2.1.0.a1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/devel/py-simpleparse/pkg-plist b/devel/py-simpleparse/pkg-plist
index 14c53e3dd060..2d9efea7d2d3 100644
--- a/devel/py-simpleparse/pkg-plist
+++ b/devel/py-simpleparse/pkg-plist
@@ -53,9 +53,7 @@
 %%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/mxTextTools/mxTextTools.so
 %%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/mxTextTools/__init__.pyc
 %%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/mxTextTools/__init__.pyo
-%%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/TextTools.pyc
 %%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/__init__.pyc
-%%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/TextTools.pyo
 %%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/__init__.pyo
 %%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/LICENSE
 %%PYTHON_SITELIBDIR%%/simpleparse/stt/TextTools/README
diff --git a/devel/py-ydbf/Makefile b/devel/py-ydbf/Makefile
index 310ea394a6eb..407b490517ff 100644
--- a/devel/py-ydbf/Makefile
+++ b/devel/py-ydbf/Makefile
@@ -15,12 +15,12 @@ DISTNAME=	YDbf-0.0.1dev-20080514
 MAINTAINER=	andrey.polyakov@unix.net
 COMMENT=	Yelded DBF reader/writer for Python
 
-BUILD_DEPENDS=	easy_install:${PORTSDIR}/devel/py-setuptools
-
-PLIST_FILES=	lib/${PYTHON_VERSION}/site-packages/YDbf-0.0.1dev_20080514-py2.5.egg
+PLIST_FILES=	${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/${PYEASYINSTALL_EGG}
 
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_NOEGGINFO=	yes
+PYDISTUTILS_PKGNAME=	YDbf
+PYDISTUTILS_PKGVERSION=	0.0.1dev_20080514
 
 .include <bsd.port.mk>
diff --git a/devel/pyrex/Makefile b/devel/pyrex/Makefile
index fea3fa7c6218..d8c1bac5223f 100644
--- a/devel/pyrex/Makefile
+++ b/devel/pyrex/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pyrex
 PORTVERSION=	0.9.8.5
+PORTREVISION=	1
 CATEGORIES=	devel lang python
 MASTER_SITES=	http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/
 PKGNAMEPREFIX=	${PYTHONPKGNAMEPREFIX}
diff --git a/devel/pyrex/files/patch-Pyrex-Compiler_Errors.py b/devel/pyrex/files/patch-Pyrex-Compiler_Errors.py
new file mode 100644
index 000000000000..23218766ec99
--- /dev/null
+++ b/devel/pyrex/files/patch-Pyrex-Compiler_Errors.py
@@ -0,0 +1,11 @@
+--- Pyrex/Compiler/Errors.py.orig	2009-05-18 12:29:49.000000000 +0200
++++ Pyrex/Compiler/Errors.py	2009-05-18 12:32:21.000000000 +0200
+@@ -14,7 +14,7 @@
+     
+     def __init__(self, position = None, message = ""):
+         self.position = position
+-        self.message = message
++        self._message = message
+         if position:
+             pos_str = "%s:%d:%d: " % position
+         else:
diff --git a/devel/zeroinstall-injector/Makefile b/devel/zeroinstall-injector/Makefile
index e95a312b271e..0f518b75c9ee 100644
--- a/devel/zeroinstall-injector/Makefile
+++ b/devel/zeroinstall-injector/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	zeroinstall-injector
 PORTVERSION=	0.39
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=zero-install
@@ -22,6 +23,7 @@ RUN_DEPENDS+=	lzma:${PORTSDIR}/archivers/lzma
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
+PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
 
 MAN1=		0launch.1 0alias.1 0store.1 0store-secure-add.1 0desktop.1
 
diff --git a/devel/zeroinstall-injector/pkg-plist b/devel/zeroinstall-injector/pkg-plist
index 9ed01801eecc..f7699cdf5dc9 100644
--- a/devel/zeroinstall-injector/pkg-plist
+++ b/devel/zeroinstall-injector/pkg-plist
@@ -182,7 +182,7 @@ etc/xdg/menus/applications-merged/zeroinstall.menu
 %%PYTHON_SITELIBDIR%%/zeroinstall/zerostore/unpack.py
 %%PYTHON_SITELIBDIR%%/zeroinstall/zerostore/unpack.pyc
 %%PYTHON_SITELIBDIR%%/zeroinstall/zerostore/unpack.pyo
-%%PYTHON_SITELIBDIR%%/zeroinstall_injector-0.39-py2.5.egg-info
+%%PYTHON_SITELIBDIR%%/zeroinstall_injector-0.39-py%%PYTHON_VER%%.egg-info
 share/applications/zeroinstall-add.desktop
 share/applications/zeroinstall-manage.desktop
 share/desktop-directories/zeroinstall.directory