11 files changed, 0 insertions, 524 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 2312beaf8696..b9274dcac579 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -511,7 +511,6 @@
     SUBDIR += xmbase-grok
     SUBDIR += xmysqladmin
     SUBDIR += yasql
-    SUBDIR += zodb
     SUBDIR += zodb3
 
 .include <bsd.port.subdir.mk>
diff --git a/databases/zodb/Makefile b/databases/zodb/Makefile
deleted file mode 100644
index 07ef5e5b8203..000000000000
--- a/databases/zodb/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# New ports collection makefile for:	zodb
-# Date created:		18 September 2001
-# Whom:	      		Johann Visagie <wjv@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	zodb
-PORTVERSION=	1.0
-PORTEPOCH=	1
-CATEGORIES=	databases python
-MASTER_SITES=	http://www.zope.org/Products/StandaloneZODB/1.0%20final/
-DISTNAME=	StandaloneZODB-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The Zope Object Database, a persistent object database for Python
-
-DEPRECATED=	outdated software, databases/zodb3 should be used
-EXPIRATION_DATE=	2007-03-16
-
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bsddb3/__init__.py:${PORTSDIR}/databases/py-bsddb3
-
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
-CONFLICTS=	zodb*-3.*
-
-pre-install:
-	@ ${SH} ${PKGREQ} INSTALL
-
-.include <bsd.port.mk>
diff --git a/databases/zodb/distinfo b/databases/zodb/distinfo
deleted file mode 100644
index 1d51c98de1e5..000000000000
--- a/databases/zodb/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (StandaloneZODB-1.0.tar.gz) = 4444c4e8b7f1cc52e891aa25ab1781c4
-SHA256 (StandaloneZODB-1.0.tar.gz) = 2c9200c80b1478bd6a1b2b69c1058980953220cb104bffb738cd070fed76efce
-SIZE (StandaloneZODB-1.0.tar.gz) = 406862
diff --git a/databases/zodb/files/patch-BTrees::convert.py b/databases/zodb/files/patch-BTrees::convert.py
deleted file mode 100644
index 67d395849670..000000000000
--- a/databases/zodb/files/patch-BTrees::convert.py
+++ /dev/null
@@ -1,16 +0,0 @@
---- BTrees/convert.py.orig	Fri Dec  3 01:25:34 2004
-+++ BTrees/convert.py	Fri Dec  3 01:26:15 2004
-@@ -13,11 +13,11 @@
- ##############################################################################
- 
- 
--def convert(old, new, threshold=200, f=None, None=None):
-+def convert(old, new, threshold=200, f=None, _None=None):
-     "Utility for converting old btree to new"
-     n=0
-     for k, v in old.items():
--        if f is not None: v=f(v)
-+        if f is not _None: v=f(v)
-         new[k]=v
-         n=n+1
-         if n > threshold:
diff --git a/databases/zodb/files/patch-ZEO::StorageServer.py b/databases/zodb/files/patch-ZEO::StorageServer.py
deleted file mode 100644
index 80002e12456f..000000000000
--- a/databases/zodb/files/patch-ZEO::StorageServer.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- ZEO/StorageServer.py.orig	Fri Dec  3 01:27:05 2004
-+++ ZEO/StorageServer.py	Fri Dec  3 01:27:22 2004
-@@ -268,7 +268,7 @@
- 
-     def message_input(self, message,
-                       dump=dump, Unpickler=Unpickler, StringIO=StringIO,
--                      None=None):
-+                      _None=None):
-         if __debug__:
-             if len(message) > max_blather:
-                 tmp = `message[:max_blather]`
-@@ -276,7 +276,7 @@
-                 tmp = `message`
-             blather('message_input', id(self), tmp)
- 
--        if self.__storage is None:
-+        if self.__storage is _None:
-             # This is the first communication from the client
-             self.__storage, self.__storage_id = (
-                 self.__server.register_connection(self, message))
diff --git a/databases/zodb/files/patch-ZODB::ConflictResolution.py b/databases/zodb/files/patch-ZODB::ConflictResolution.py
deleted file mode 100644
index ea874fe4f56b..000000000000
--- a/databases/zodb/files/patch-ZODB::ConflictResolution.py
+++ /dev/null
@@ -1,17 +0,0 @@
---- ZODB/ConflictResolution.py.orig	Fri Dec  3 01:28:07 2004
-+++ ZODB/ConflictResolution.py	Fri Dec  3 01:28:26 2004
-@@ -56,12 +56,12 @@
-     data=None
-     
-     def __call__(self, oid,
--                 getattr=getattr, None=None):
-+                 getattr=getattr, _None=None):
- 
-         data=self.data
-         if not data: data=self.data={}
- 
--        r=data.get(oid, None)
-+        r=data.get(oid, _None)
-         if r is None:
-             r=PersistentReference()
-             r.data=oid
diff --git a/databases/zodb/files/patch-ZODB::Transaction.py b/databases/zodb/files/patch-ZODB::Transaction.py
deleted file mode 100644
index aac4de3394c9..000000000000
--- a/databases/zodb/files/patch-ZODB::Transaction.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- ZODB/Transaction.py.orig	Fri Dec  3 01:29:04 2004
-+++ ZODB/Transaction.py	Fri Dec  3 01:29:17 2004
-@@ -351,9 +351,9 @@
- 
- else:
-     _t={}
--    def get_transaction(_id=thread.get_ident, _t=_t, get=_t.get, None=None):
-+    def get_transaction(_id=thread.get_ident, _t=_t, get=_t.get, _None=None):
-         id=_id()
--        t=get(id, None)
-+        t=get(id, _None)
-         if t is None: _t[id]=t=Transaction(id)
-         return t
- 
diff --git a/databases/zodb/files/patch-ZODB::referencesf.py b/databases/zodb/files/patch-ZODB::referencesf.py
deleted file mode 100644
index 7dca5530ccd4..000000000000
--- a/databases/zodb/files/patch-ZODB::referencesf.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- ZODB/referencesf.py.orig	Fri Dec  3 01:29:52 2004
-+++ ZODB/referencesf.py	Fri Dec  3 01:30:06 2004
-@@ -19,9 +19,9 @@
-                 Unpickler=cPickle.Unpickler,
-                 StringIO=cStringIO.StringIO,
-                 tt=type(()),
--                type=type, None=None):
-+                type=type, _None=None):
- 
--    if rootl is None: rootl=[]
-+    if rootl is _None: rootl=[]
-     u=Unpickler(StringIO(p))
-     l=len(rootl)
-     u.persistent_load=rootl
diff --git a/databases/zodb/pkg-descr b/databases/zodb/pkg-descr
deleted file mode 100644
index fcb7a208722b..000000000000
--- a/databases/zodb/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-ZODB, the Zope Object Database, is a persistent object database system for
-Python.  It provides facilities to write objects to disk automatically, read
-them in again when they're required by a running program, and cache them.
-
-ZODB normally forms part of the Zope application framework by Zope
-Corporation (previously Digital Creations).  (See port www/zope.)  However,
-it has found significant application outside of Zope.
-
-This port represents StandaloneZODB, an official standalone distribution of
-ZODB by Pythonlabs, a division of Zope Corporation.  This official
-distribution is now merging with with Andrew Kuchling's third party
-standalone repackaging of ZODB that was formerly the focus of this port.
-
-StandaloneZODB includes a standalone version of Zope Enterprise
-Objects (ZEO), a tool to distribute ZODB stores across a network.
-
-Author:   Barry A Warsaw <barry@zope.com> and a host of others
-WWW:      http://www.zope.org/Products/StandaloneZODB/
-See also: http://amk.ca/zodb/guide/ (ZODB Programming Guide)
-
--- Johann Visagie <wjv@FreeBSD.org>
diff --git a/databases/zodb/pkg-plist b/databases/zodb/pkg-plist
deleted file mode 100644
index 3f5023fbcacc..000000000000
--- a/databases/zodb/pkg-plist
+++ /dev/null
@@ -1,371 +0,0 @@
-include/%%PYTHON_VERSION%%/StandaloneZODB/ExtensionClass.h
-include/%%PYTHON_VERSION%%/StandaloneZODB/cPersistence.h
-lib/%%PYTHON_VERSION%%/site-packages/Acquisition.so
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/IIBTree.py
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/IIBTree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/IIBTree.pyo
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/IOBTree.py
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/IOBTree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/IOBTree.pyo
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/Interfaces.py
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/Interfaces.pyc
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/Interfaces.pyo
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/Length.py
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/Length.pyc
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/Length.pyo
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/OIBTree.py
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/OIBTree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/OIBTree.pyo
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/OOBTree.py
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/OOBTree.pyc
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/OOBTree.pyo
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/_IIBTree.so
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/_IOBTree.so
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/_OIBTree.so
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/_OOBTree.so
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/_fsBTree.so
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/convert.py
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/convert.pyc
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/convert.pyo
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testBTrees.py
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testBTrees.pyc
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testBTrees.pyo
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testBTreesUnicode.py
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testBTreesUnicode.pyc
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testBTreesUnicode.pyo
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testConflict.py
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testConflict.pyc
-lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests/testConflict.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ComputedAttribute.so
-lib/%%PYTHON_VERSION%%/site-packages/ExtensionClass.so
-lib/%%PYTHON_VERSION%%/site-packages/MethodObject.so
-lib/%%PYTHON_VERSION%%/site-packages/Missing.so
-lib/%%PYTHON_VERSION%%/site-packages/MultiMapping.so
-lib/%%PYTHON_VERSION%%/site-packages/Persistence/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/Persistence/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/Persistence/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/Record.so
-lib/%%PYTHON_VERSION%%/site-packages/Sync.so
-lib/%%PYTHON_VERSION%%/site-packages/ThreadLock.so
-lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync/LoopCallback.py
-lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync/LoopCallback.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync/LoopCallback.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/ClientCache.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/ClientCache.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/ClientCache.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/ClientStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/ClientStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/ClientStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/Invalidator.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/Invalidator.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/Invalidator.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/StorageServer.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/StorageServer.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/StorageServer.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/asyncwrap.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/asyncwrap.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/asyncwrap.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/fap.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/fap.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/fap.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/smac.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/smac.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/smac.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/start.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/start.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/start.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/Cache.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/Cache.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/Cache.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/forker.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/forker.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/forker.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/multi.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/multi.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/multi.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/speed.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/speed.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/speed.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/stress.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/stress.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/stress.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/testZEO.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/testZEO.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/testZEO.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/winserver.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/winserver.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests/winserver.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/trigger.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/trigger.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/trigger.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/zrpc.py
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/zrpc.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZEO/zrpc.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/BaseStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/BaseStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/BaseStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/ConflictResolution.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/ConflictResolution.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/ConflictResolution.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/Connection.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/Connection.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/Connection.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/DB.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/DB.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/DB.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/DemoStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/DemoStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/DemoStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/ExportImport.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/ExportImport.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/ExportImport.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/FileStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/FileStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/FileStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/MappingStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/MappingStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/MappingStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/Mount.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/Mount.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/Mount.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/POSException.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/POSException.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/POSException.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/PersistentList.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/PersistentList.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/PersistentList.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/PersistentMapping.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/PersistentMapping.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/PersistentMapping.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/TimeStamp.so
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/TmpStore.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/TmpStore.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/TmpStore.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/Transaction.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/Transaction.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/Transaction.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/UndoLogCompatible.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/UndoLogCompatible.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/UndoLogCompatible.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/ZApplication.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/ZApplication.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/ZApplication.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/bpthread.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/bpthread.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/bpthread.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/cPersistence.so
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/cPickleCache.so
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/coptimizations.so
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/dbmStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/dbmStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/dbmStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/fsIndex.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/fsIndex.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/fsIndex.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/fsrecover.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/fsrecover.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/fsrecover.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/lock_file.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/lock_file.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/lock_file.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/referencesf.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/referencesf.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/referencesf.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/BasicStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/BasicStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/BasicStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/ConflictResolution.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/ConflictResolution.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/ConflictResolution.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/Corruption.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/Corruption.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/Corruption.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/HistoryStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/HistoryStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/HistoryStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/IteratorStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/IteratorStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/IteratorStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/LocalStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/LocalStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/LocalStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/MinPO.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/MinPO.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/MinPO.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/PackableStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/PackableStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/PackableStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/PersistentStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/PersistentStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/PersistentStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/RevisionStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/RevisionStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/RevisionStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/StorageTestBase.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/StorageTestBase.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/StorageTestBase.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/Synchronization.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/Synchronization.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/Synchronization.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/TransactionalUndoStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/TransactionalUndoStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/TransactionalUndoStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/TransactionalUndoVersionStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/TransactionalUndoVersionStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/TransactionalUndoVersionStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/VersionStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/VersionStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/VersionStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/speed.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/speed.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/speed.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testDemoStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testDemoStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testDemoStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testFileStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testFileStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testFileStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testMappingStorage.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testMappingStorage.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testMappingStorage.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testPersistentList.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testPersistentList.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testPersistentList.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testPersistentMapping.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testPersistentMapping.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testPersistentMapping.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testTimeStamp.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testTimeStamp.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testTimeStamp.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testTransaction.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testTransaction.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testTransaction.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testUtils.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testUtils.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testUtils.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testZODB.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testZODB.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testZODB.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testfsIndex.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testfsIndex.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests/testfsIndex.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/utils.py
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/utils.pyc
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/utils.pyo
-lib/%%PYTHON_VERSION%%/site-packages/ZODB/winlock.so
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/BerkeleyBase.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/BerkeleyBase.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/BerkeleyBase.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/CommitLog.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/CommitLog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/CommitLog.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Full.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Full.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Full.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Minimal.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Minimal.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Minimal.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/MinimalReplicated.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/MinimalReplicated.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/MinimalReplicated.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Packless.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Packless.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/Packless.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/base.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/base.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/base.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/BerkeleyTestBase.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/BerkeleyTestBase.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/BerkeleyTestBase.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/ZODBTestBase.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/ZODBTestBase.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/ZODBTestBase.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_commitlog.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_commitlog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_commitlog.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_create.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_create.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_create.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_storage_api.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_storage_api.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_storage_api.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_virgin.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_virgin.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_virgin.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_zodb_simple.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_zodb_simple.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/test_zodb_simple.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/testall.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/testall.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/testall.pyo
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/timeiter.py
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/timeiter.pyc
-lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests/timeiter.pyo
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/FormatException.py
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/FormatException.pyc
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/FormatException.pyo
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/MinimalLogger.py
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/MinimalLogger.pyc
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/MinimalLogger.pyo
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/tests/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/tests/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/tests/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/tests/testzLog.py
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/tests/testzLog.pyc
-lib/%%PYTHON_VERSION%%/site-packages/zLOG/tests/testzLog.pyo
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon/Daemon.py
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon/Daemon.pyc
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon/Daemon.pyo
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon/Heartbeat.py
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon/Heartbeat.pyc
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon/Heartbeat.pyo
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon/ZDaemonLogging.py
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon/ZDaemonLogging.pyc
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon/ZDaemonLogging.pyo
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/zdaemon/__init__.pyo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/zdaemon
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/zLOG/tests
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/zLOG
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage/tests
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/bsddb3Storage
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/ZODB/tests
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/ZODB
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/ZEO/tests
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/ZEO
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/ThreadedAsync
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/Persistence
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/BTrees/tests
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/BTrees
-@dirrm include/%%PYTHON_VERSION%%/StandaloneZODB
diff --git a/databases/zodb/pkg-req b/databases/zodb/pkg-req
deleted file mode 100644
index d5d99df207bb..000000000000
--- a/databases/zodb/pkg-req
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-PATH=$PATH:/usr/local/bin
-
-if [ "x$1" = "xINSTALL" -o "x$2" = "xINSTALL" ]; then
-  PYTHON_GT=`python -c 'import string, sys; \
-                        print string.split(sys.version)[0] >= "2.1" and 1'`
-  if [ "x${PYTHON_GT}" = "x1" ]; then
-    exit 0
-  else
-    echo "-----------------------------------------------------------"
-    echo "ZODB requires Python version 2.1 or greater -"
-    echo "  please update your Python installation before proceeding."
-    echo "-----------------------------------------------------------"
-    exit 1
-  fi
-fi