3 files changed, 18 insertions, 31 deletions

diff --git a/databases/zodb3/Makefile b/databases/zodb3/Makefile
index 79a16c93b43c..9b77216896f2 100644
--- a/databases/zodb3/Makefile
+++ b/databases/zodb3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	zodb
-PORTVERSION=	3.9.7
+PORTVERSION=	3.10.0
 CATEGORIES=	databases
 MASTER_SITES=	CHEESESHOP
 PKGNAMESUFFIX=	-py${PYTHON_SUFFIX}
diff --git a/databases/zodb3/distinfo b/databases/zodb3/distinfo
index ddb50864d998..59755382bc81 100644
--- a/databases/zodb3/distinfo
+++ b/databases/zodb3/distinfo
@@ -1,3 +1,3 @@
-MD5 (ZODB3-3.9.7.tar.gz) = c4202392af6d45fe899ec7da31a7ead4
-SHA256 (ZODB3-3.9.7.tar.gz) = 60670d59748d407482399ae6b15da53c0f70d82012553544e6a6265f35080880
-SIZE (ZODB3-3.9.7.tar.gz) = 705048
+MD5 (ZODB3-3.10.0.tar.gz) = ee6763f95854816de47efaf4d54338ed
+SHA256 (ZODB3-3.10.0.tar.gz) = 5b72a1b3cc79e3c3556da91ed7e1b58600fc3dfb57426a909e419323b1ddaf27
+SIZE (ZODB3-3.10.0.tar.gz) = 711738
diff --git a/databases/zodb3/pkg-plist b/databases/zodb3/pkg-plist
index b756a7e67cc4..09a5604e1c57 100644
--- a/databases/zodb3/pkg-plist
+++ b/databases/zodb3/pkg-plist
@@ -2,7 +2,6 @@ bin/fsdump
 bin/fsoids
 bin/fsrefs
 bin/fstail
-bin/mkzeoinst
 bin/repozo
 bin/runzeo
 bin/zeoctl
@@ -137,6 +136,9 @@ bin/zeopasswd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_btreesubclass.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_btreesubclass.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_btreesubclass.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_fsBTree.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_fsBTree.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_fsBTree.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_check.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_check.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/BTrees/tests/test_check.pyo
@@ -154,13 +156,9 @@ bin/zeopasswd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/ClientStorage.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/ClientStorage.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/ClientStorage.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/CommitLog.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/CommitLog.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/CommitLog.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/Exceptions.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/Exceptions.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/Exceptions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/README.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/ServerStub.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/ServerStub.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/ServerStub.pyo
@@ -195,9 +193,6 @@ bin/zeopasswd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/interfaces.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/interfaces.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/mkzeoinst.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/mkzeoinst.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/mkzeoinst.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/monitor.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/monitor.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/monitor.pyo
@@ -210,9 +205,12 @@ bin/zeopasswd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/manual_tests/testzeopack.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/manual_tests/testzeopack.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/manual_tests/testzeopack.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/cache_simul.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/cache_simul.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/cache_simul.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/cache_stats.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/cache_stats.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/cache_stats.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/parsezeolog.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/parsezeolog.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/scripts/parsezeolog.pyo
@@ -266,15 +264,11 @@ bin/zeopasswd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/auth_plaintext.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/auth_plaintext.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/client-config.test
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/deadlock.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/deadlock.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/deadlock.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/drop_cache_rather_than_verify.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/forker.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/forker.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/forker.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/invalidation-age.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/invalidations_while_connecting.test
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/protocols.test
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/registerDB.test
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZEO/tests/servertesting.py
@@ -437,9 +431,6 @@ bin/zeopasswd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/conversionhack.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/conversionhack.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/cross-database-references.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/dbmStorage.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/dbmStorage.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/dbmStorage.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/fsIndex.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/fsIndex.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/fsIndex.pyo
@@ -489,9 +480,6 @@ bin/zeopasswd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/manual_tests/testfstest.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/manual_tests/testfstest.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/manual_tests/testfstest.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/manual_tests/testzeopack.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/manual_tests/testzeopack.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/manual_tests/testzeopack.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/migrate.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/migrate.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/migrate.pyo
@@ -507,15 +495,9 @@ bin/zeopasswd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/repozo.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/repozo.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/repozo.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/simul.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/simul.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/simul.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/space.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/space.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/space.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/stats.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/stats.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/stats.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/tests/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/tests/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/scripts/tests/__init__.pyo
@@ -599,14 +581,19 @@ bin/zeopasswd
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/blob_tempdir.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/blob_transaction.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/blobstorage_packing.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/component.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/dangle.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/dangle.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/dangle.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/dbopen.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/hexstorage.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/hexstorage.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/hexstorage.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/loggingsupport.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/loggingsupport.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/loggingsupport.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/multidb.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/new_oids_get_reused_on_abort.test
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/sampledm.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/sampledm.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZODB/tests/sampledm.pyo