Re: git: a9fab6656cc8 - main - zope ports: remove leaf zope ports that have no sence in absence of zope itself

From: Moin Rahman <bofh_at_freebsd.org>
Date: Sun, 27 Aug 2023 18:24:18 UTC
Thanks. :)

> On Aug 27, 2023, at 8:05 PM, Ruslan Makhmatkhanov <rm@freebsd.org> wrote:
> 
> Fixed in ce4a9c438d2c80e2625d207bdc9b52861ea62288. Sorry for the mess.
> 
> 27.08.2023, 18:53, "Moin Rahman" <bofh@freebsd.org>:
> This breaks INDEX with
> 
> make_index: /usr/local/poudriere/ports/default/devel/py-zope.configuration: no entry for /usr/local/poudriere/ports/default/textproc/py-zope.i18nmessageid
> 
> 
> 
>  On Aug 27, 2023, at 1:09 PM, Ruslan Makhmatkhanov <rm@freebsd.org <mailto:rm@freebsd.org>> wrote:
> 
>  The branch main has been updated by rm:
> 
>  URL: https://cgit.FreeBSD.org/ports/commit/?id=a9fab6656cc8b301a235c967ed2459adb58f346b <https://cgit.freebsd.org/ports/commit/?id=a9fab6656cc8b301a235c967ed2459adb58f346b>
> 
>  commit a9fab6656cc8b301a235c967ed2459adb58f346b
>  Author: Ruslan Makhmatkhanov <rm@FreeBSD.org <mailto:rm@FreeBSD.org>>
>  AuthorDate: 2023-08-27 11:07:57 +0000
>  Commit: Ruslan Makhmatkhanov <rm@FreeBSD.org <mailto:rm@FreeBSD.org>>
>  CommitDate: 2023-08-27 11:08:40 +0000
> 
>     zope ports: remove leaf zope ports that have no sence in absence of zope itself
> 
>     With hat: zope
>  ---
>  MOVED | 21 ++
>  devel/Makefile | 22 --
>  devel/py-z3c.autoinclude/Makefile | 24 --
>  devel/py-z3c.autoinclude/distinfo | 2 -
>  devel/py-z3c.autoinclude/files/patch-2to3 | 11 -
>  devel/py-z3c.autoinclude/pkg-descr | 1 -
>  devel/py-z3c.batching/Makefile | 21 --
>  devel/py-z3c.batching/distinfo | 2 -
>  devel/py-z3c.batching/pkg-descr | 2 -
>  devel/py-z3c.zcmlhook/Makefile | 23 --
>  devel/py-z3c.zcmlhook/distinfo | 2 -
>  devel/py-z3c.zcmlhook/pkg-descr | 1 -
>  devel/py-zc.buildout/Makefile | 19 --
>  devel/py-zc.buildout/distinfo | 3 -
>  devel/py-zc.buildout/pkg-descr | 4 -
>  devel/py-zope.app.basicskin/Makefile | 22 --
>  devel/py-zope.app.basicskin/distinfo | 2 -
>  devel/py-zope.app.basicskin/pkg-descr | 1 -
>  devel/py-zope.app.renderer/Makefile | 28 --
>  devel/py-zope.app.renderer/distinfo | 2 -
>  devel/py-zope.app.renderer/pkg-descr | 1 -
>  devel/py-zope.app.schema/Makefile | 22 --
>  devel/py-zope.app.schema/distinfo | 2 -
>  devel/py-zope.app.schema/pkg-descr | 1 -
>  devel/py-zope.broken/Makefile | 20 --
>  devel/py-zope.broken/distinfo | 2 -
>  devel/py-zope.broken/pkg-descr | 2 -
>  devel/py-zope.browserresource/Makefile | 31 --
>  devel/py-zope.browserresource/distinfo | 2 -
>  devel/py-zope.browserresource/files/patch-2to3 | 20 --
>  devel/py-zope.browserresource/pkg-descr | 3 -
>  devel/py-zope.cachedescriptors/Makefile | 18 --
>  devel/py-zope.cachedescriptors/distinfo | 2 -
>  devel/py-zope.cachedescriptors/files/patch-2to3 | 11 -
>  devel/py-zope.cachedescriptors/pkg-descr | 1 -
>  devel/py-zope.contentprovider/Makefile | 26 --
>  devel/py-zope.contentprovider/distinfo | 2 -
>  devel/py-zope.contentprovider/pkg-descr | 5 -
>  devel/py-zope.copy/Makefile | 20 --
>  devel/py-zope.copy/distinfo | 2 -
>  devel/py-zope.copy/pkg-descr | 4 -
>  devel/py-zope.datetime/Makefile | 18 --
>  devel/py-zope.datetime/distinfo | 2 -
>  devel/py-zope.datetime/files/patch-2to3 | 167 ----------
>  devel/py-zope.datetime/pkg-descr | 2 -
>  devel/py-zope.deferredimport/Makefile | 20 --
>  devel/py-zope.deferredimport/distinfo | 2 -
>  devel/py-zope.deferredimport/files/patch-2to3 | 55 ----
>  devel/py-zope.deferredimport/pkg-descr | 2 -
>  devel/py-zope.dottedname/Makefile | 20 --
>  devel/py-zope.dottedname/distinfo | 2 -
>  devel/py-zope.dottedname/pkg-descr | 3 -
>  devel/py-zope.filerepresentation/Makefile | 21 --
>  devel/py-zope.filerepresentation/distinfo | 2 -
>  devel/py-zope.filerepresentation/pkg-descr | 4 -
>  devel/py-zope.generations/Makefile | 23 --
>  devel/py-zope.generations/distinfo | 2 -
>  devel/py-zope.generations/files/patch-2to3 | 22 --
>  devel/py-zope.generations/pkg-descr | 1 -
>  devel/py-zope.lifecycleevent/Makefile | 22 --
>  devel/py-zope.lifecycleevent/distinfo | 2 -
>  devel/py-zope.lifecycleevent/pkg-descr | 1 -
>  devel/py-zope.processlifetime/Makefile | 22 --
>  devel/py-zope.processlifetime/distinfo | 2 -
>  devel/py-zope.processlifetime/pkg-descr | 2 -
>  devel/py-zope.sequencesort/Makefile | 18 --
>  devel/py-zope.sequencesort/distinfo | 2 -
>  devel/py-zope.sequencesort/files/patch-2to3 | 45 ---
>  devel/py-zope.sequencesort/pkg-descr | 1 -
>  devel/py-zope.size/Makefile | 21 --
>  devel/py-zope.size/distinfo | 2 -
>  devel/py-zope.size/files/patch-2to3 | 78 -----
>  devel/py-zope.size/pkg-descr | 2 -
>  devel/py-zope.tales/Makefile | 23 --
>  devel/py-zope.tales/distinfo | 2 -
>  devel/py-zope.tales/files/patch-2to3 | 393 ------------------------
>  devel/py-zope.tales/pkg-descr | 1 -
>  77 files changed, 21 insertions(+), 1396 deletions(-)
> 
>  diff --git a/MOVED b/MOVED
>  index 4993d124d7d1..a8062e51a648 100644
>  --- a/MOVED
>  +++ b/MOVED
>  @@ -7801,3 +7801,24 @@ irc/birch||2023-08-25|Has expired: Upstream no longer maintained
>  net-im/6cord||2023-08-25|Has expired: Upstream no longer maintained
>  devel/py-gpep517||2023-08-26|Remove obsoleted port. It is no longer needed after Python 3.7 removal
>  devel/py-rapidfuzz2|devel/py-rapidfuzz|2023-08-26|Remove obsoleted port. Use devel/py-rapidfuzz instead
>  +devel/py-z3c.zcmlhook||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zc.buildout||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-z3c.autoinclude||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.dottedname||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.app.basicskin||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.app.renderer||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.app.schema||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.broken||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.browserresource||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.cachedescriptors||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.contentprovider||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.copy||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.datetime||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.deferredimport||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.filerepresentation||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.generations||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.lifecycleevent||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.processlifetime||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.sequencesort||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.size||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  +devel/py-zope.tales||2023-08-27|Remove leaf zope ports that have no sence in absence of zope itself
>  diff --git a/devel/Makefile b/devel/Makefile
>  index 3f772fcc3c47..4b33775dd6d5 100644
>  --- a/devel/Makefile
>  +++ b/devel/Makefile
>  @@ -5835,47 +5835,25 @@
>      SUBDIR += py-yg.lockfile
>      SUBDIR += py-ypy-websocket
>      SUBDIR += py-yunomi
>  - SUBDIR += py-z3c.autoinclude
>  - SUBDIR += py-z3c.batching
>  - SUBDIR += py-z3c.zcmlhook
>      SUBDIR += py-zarr
>  - SUBDIR += py-zc.buildout
>      SUBDIR += py-zclockfile
>      SUBDIR += py-zconfig
>      SUBDIR += py-zfp
>      SUBDIR += py-zict
>      SUBDIR += py-zipp
>  - SUBDIR += py-zope.app.basicskin
>  - SUBDIR += py-zope.app.renderer
>  - SUBDIR += py-zope.app.schema
>  - SUBDIR += py-zope.broken
>      SUBDIR += py-zope.browser
>  - SUBDIR += py-zope.browserresource
>  - SUBDIR += py-zope.cachedescriptors
>      SUBDIR += py-zope.component
>      SUBDIR += py-zope.configuration
>  - SUBDIR += py-zope.contentprovider
>      SUBDIR += py-zope.contenttype
>  - SUBDIR += py-zope.copy
>  - SUBDIR += py-zope.datetime
>  - SUBDIR += py-zope.deferredimport
>      SUBDIR += py-zope.deprecation
>  - SUBDIR += py-zope.dottedname
>      SUBDIR += py-zope.event
>      SUBDIR += py-zope.exceptions
>  - SUBDIR += py-zope.filerepresentation
>  - SUBDIR += py-zope.generations
>      SUBDIR += py-zope.globalrequest
>      SUBDIR += py-zope.i18n
>      SUBDIR += py-zope.interface
>  - SUBDIR += py-zope.lifecycleevent
>      SUBDIR += py-zope.location
>  - SUBDIR += py-zope.processlifetime
>      SUBDIR += py-zope.publisher
>      SUBDIR += py-zope.schema
>  - SUBDIR += py-zope.sequencesort
>  - SUBDIR += py-zope.size
>  - SUBDIR += py-zope.tales
>      SUBDIR += py-zope.testbrowser
>      SUBDIR += py-zope.testing
>      SUBDIR += py-zope.traversing
>  diff --git a/devel/py-z3c.autoinclude/Makefile b/devel/py-z3c.autoinclude/Makefile
>  deleted file mode 100644
>  index 0355fbcacd87..000000000000
>  --- a/devel/py-z3c.autoinclude/Makefile
>  +++ /dev/null
>  @@ -1,24 +0,0 @@
>  -PORTNAME= z3c.autoinclude
>  -PORTVERSION= 0.3.6
>  -CATEGORIES= devel python zope
>  -MASTER_SITES= PYPI
>  -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>  -DIST_SUBDIR= zope
>  -
>  -MAINTAINER= zope@FreeBSD.org <mailto:zope@FreeBSD.org>
>  -COMMENT= Automatically include ZCML
>  -WWW= https://pypi.org/project/z3c.autoinclude/
>  -
>  -LICENSE= ZPL21
>  -
>  -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.dottedname>=0:devel/py-zope.dottedname@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zc.buildout>=0:devel/py-zc.buildout@${PY_FLAVOR}
>  -
>  -NO_ARCH= yes
>  -USES= python
>  -USE_PYTHON= autoplist distutils
>  -
>  -.include <bsd.port.mk>
>  diff --git a/devel/py-z3c.autoinclude/distinfo b/devel/py-z3c.autoinclude/distinfo
>  deleted file mode 100644
>  index 35481d9add5b..000000000000
>  --- a/devel/py-z3c.autoinclude/distinfo
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  -SHA256 (zope/z3c.autoinclude-0.3.6.tar.gz) = 2e4e0ff2ff827642603a4dfffcf376f7869ccd3e66ee25c211115e7866f81e41
>  -SIZE (zope/z3c.autoinclude-0.3.6.tar.gz) = 23394
>  diff --git a/devel/py-z3c.autoinclude/files/patch-2to3 b/devel/py-z3c.autoinclude/files/patch-2to3
>  deleted file mode 100644
>  index 6f00467ae26f..000000000000
>  --- a/devel/py-z3c.autoinclude/files/patch-2to3
>  +++ /dev/null
>  @@ -1,11 +0,0 @@
>  ---- src/z3c/autoinclude/dependency.py.orig 2016-01-29 12:30:33 UTC
>  -+++ src/z3c/autoinclude/dependency.py
>  -@@ -24,7 +24,7 @@ class DependencyFinder(DistributionManager):
>  - for dotted_name in dist_manager.dottedNames():
>  - try:
>  - module = resolve(dotted_name)
>  -- except ImportError, exc:
>  -+ except ImportError as exc:
>  - logging.getLogger("z3c.autoinclude").warn(
>  - "resolve(%r) raised import error: %s" % (dotted_name, exc))
>  - continue
>  diff --git a/devel/py-z3c.autoinclude/pkg-descr b/devel/py-z3c.autoinclude/pkg-descr
>  deleted file mode 100644
>  index eed69c38e553..000000000000
>  --- a/devel/py-z3c.autoinclude/pkg-descr
>  +++ /dev/null
>  @@ -1 +0,0 @@
>  -Automatically include ZCML.
>  diff --git a/devel/py-z3c.batching/Makefile b/devel/py-z3c.batching/Makefile
>  deleted file mode 100644
>  index 0da6fb0b4631..000000000000
>  --- a/devel/py-z3c.batching/Makefile
>  +++ /dev/null
>  @@ -1,21 +0,0 @@
>  -PORTNAME= z3c.batching
>  -PORTVERSION= 1.1.0
>  -PORTREVISION= 1
>  -CATEGORIES= devel python zope
>  -MASTER_SITES= PYPI
>  -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>  -DIST_SUBDIR= zope
>  -
>  -MAINTAINER= zope@FreeBSD.org <mailto:zope@FreeBSD.org>
>  -COMMENT= Simple sequence batching
>  -WWW= https://pypi.org/project/z3c.batching/
>  -
>  -LICENSE= ZPL21
>  -
>  -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR}
>  -
>  -USES= python
>  -USE_PYTHON= distutils autoplist
>  -
>  -.include <bsd.port.mk>
>  diff --git a/devel/py-z3c.batching/distinfo b/devel/py-z3c.batching/distinfo
>  deleted file mode 100644
>  index 28df2529392f..000000000000
>  --- a/devel/py-z3c.batching/distinfo
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  -SHA256 (zope/z3c.batching-1.1.0.tar.gz) = a40bebf6a3faec64921f94c583b4fc330b3d8e50e875abd0a8697fef25c281f6
>  -SIZE (zope/z3c.batching-1.1.0.tar.gz) = 8467
>  diff --git a/devel/py-z3c.batching/pkg-descr b/devel/py-z3c.batching/pkg-descr
>  deleted file mode 100644
>  index 278f39eff878..000000000000
>  --- a/devel/py-z3c.batching/pkg-descr
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  -This module implements a simple batching mechanism that allows you to split
>  -a large sequence into smaller batches.
>  diff --git a/devel/py-z3c.zcmlhook/Makefile b/devel/py-z3c.zcmlhook/Makefile
>  deleted file mode 100644
>  index 953ae9544e72..000000000000
>  --- a/devel/py-z3c.zcmlhook/Makefile
>  +++ /dev/null
>  @@ -1,23 +0,0 @@
>  -PORTNAME= z3c.zcmlhook
>  -PORTVERSION= 1.0b1
>  -PORTREVISION= 1
>  -CATEGORIES= devel python zope
>  -MASTER_SITES= PYPI
>  -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>  -DIST_SUBDIR= zope
>  -
>  -MAINTAINER= zope@FreeBSD.org <mailto:zope@FreeBSD.org>
>  -COMMENT= Easily hook into the ZCML processing machinery
>  -WWW= https://pypi.org/project/z3c.zcmlhook/
>  -
>  -LICENSE= ZPL21
>  -
>  -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR}
>  -
>  -USES= python
>  -USE_PYTHON= distutils autoplist
>  -
>  -.include <bsd.port.mk>
>  diff --git a/devel/py-z3c.zcmlhook/distinfo b/devel/py-z3c.zcmlhook/distinfo
>  deleted file mode 100644
>  index d6f1be1fa43a..000000000000
>  --- a/devel/py-z3c.zcmlhook/distinfo
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  -SHA256 (zope/z3c.zcmlhook-1.0b1.tar.gz) = f0456020738a921d68b488c453e76d7dc8b5e8c890593116854f54dfcd3c1302
>  -SIZE (zope/z3c.zcmlhook-1.0b1.tar.gz) = 5450
>  diff --git a/devel/py-z3c.zcmlhook/pkg-descr b/devel/py-z3c.zcmlhook/pkg-descr
>  deleted file mode 100644
>  index 7305d2ade903..000000000000
>  --- a/devel/py-z3c.zcmlhook/pkg-descr
>  +++ /dev/null
>  @@ -1 +0,0 @@
>  -Easily hook into the ZCML processing machinery.
>  diff --git a/devel/py-zc.buildout/Makefile b/devel/py-zc.buildout/Makefile
>  deleted file mode 100644
>  index afcd4e4d1454..000000000000
>  --- a/devel/py-zc.buildout/Makefile
>  +++ /dev/null
>  @@ -1,19 +0,0 @@
>  -PORTNAME= zc.buildout
>  -PORTVERSION= 2.11.3
>  -CATEGORIES= devel python
>  -MASTER_SITES= PYPI
>  -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>  -DIST_SUBDIR= zope
>  -
>  -MAINTAINER= rm@FreeBSD.org <mailto:rm@FreeBSD.org>
>  -COMMENT= System for managing development buildouts
>  -WWW= https://pypi.org/project/zc.buildout/
>  -
>  -LICENSE= ZPL21
>  -LICENSE_FILE= ${WRKSRC}/LICENSE.txt
>  -
>  -NO_ARCH= yes
>  -USES= python
>  -USE_PYTHON= autoplist distutils
>  -
>  -.include <bsd.port.mk>
>  diff --git a/devel/py-zc.buildout/distinfo b/devel/py-zc.buildout/distinfo
>  deleted file mode 100644
>  index 711b1e68207c..000000000000
>  --- a/devel/py-zc.buildout/distinfo
>  +++ /dev/null
>  @@ -1,3 +0,0 @@
>  -TIMESTAMP = 1525268352
>  -SHA256 (zope/zc.buildout-2.11.3.tar.gz) = f7fde2cde7b937f67e52a3e94b76f9294b73c1e9bb698430e96778f3f735544c
>  -SIZE (zope/zc.buildout-2.11.3.tar.gz) = 163542
>  diff --git a/devel/py-zc.buildout/pkg-descr b/devel/py-zc.buildout/pkg-descr
>  deleted file mode 100644
>  index 44f84894626e..000000000000
>  --- a/devel/py-zc.buildout/pkg-descr
>  +++ /dev/null
>  @@ -1,4 +0,0 @@
>  -zc.buildout provides support for creating applications, especially Python
>  -applications. It provides tools for assembling applications from multiple
>  -parts, Python or otherwise. An application may actually contain multiple
>  -programs, processes, and configuration settings.
>  diff --git a/devel/py-zope.app.basicskin/Makefile b/devel/py-zope.app.basicskin/Makefile
>  deleted file mode 100644
>  index 1292eae0c1f4..000000000000
>  --- a/devel/py-zope.app.basicskin/Makefile
>  +++ /dev/null
>  @@ -1,22 +0,0 @@
>  -PORTNAME= zope.app.basicskin
>  -PORTVERSION= 3.5.1
>  -PORTREVISION= 1
>  -CATEGORIES= devel python zope
>  -MASTER_SITES= PYPI
>  -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>  -DIST_SUBDIR= zope
>  -
>  -MAINTAINER= zope@FreeBSD.org <mailto:zope@FreeBSD.org>
>  -COMMENT= Zope ZMI Basic Skin
>  -WWW= https://pypi.org/project/zope.app.basicskin/
>  -
>  -LICENSE= ZPL21
>  -
>  -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR}
>  -
>  -USES= python
>  -USE_PYTHON= distutils autoplist
>  -
>  -.include <bsd.port.mk>
>  diff --git a/devel/py-zope.app.basicskin/distinfo b/devel/py-zope.app.basicskin/distinfo
>  deleted file mode 100644
>  index 2d7693ac9dbd..000000000000
>  --- a/devel/py-zope.app.basicskin/distinfo
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  -SHA256 (zope/zope.app.basicskin-3.5.1.tar.gz) = bc9e597fe60b2ebaa5424d1fb74ff621131d394cfa82b1688e08344e133d71b7
>  -SIZE (zope/zope.app.basicskin-3.5.1.tar.gz) = 10638
>  diff --git a/devel/py-zope.app.basicskin/pkg-descr b/devel/py-zope.app.basicskin/pkg-descr
>  deleted file mode 100644
>  index 465f91d20234..000000000000
>  --- a/devel/py-zope.app.basicskin/pkg-descr
>  +++ /dev/null
>  @@ -1 +0,0 @@
>  -Zope ZMI Basic Skin.
>  diff --git a/devel/py-zope.app.renderer/Makefile b/devel/py-zope.app.renderer/Makefile
>  deleted file mode 100644
>  index 11a8fdf20d08..000000000000
>  --- a/devel/py-zope.app.renderer/Makefile
>  +++ /dev/null
>  @@ -1,28 +0,0 @@
>  -PORTNAME= zope.app.renderer
>  -PORTVERSION= 3.5.1
>  -PORTREVISION= 1
>  -CATEGORIES= devel python zope
>  -MASTER_SITES= PYPI
>  -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>  -DIST_SUBDIR= zope
>  -
>  -MAINTAINER= zope@FreeBSD.org <mailto:zope@FreeBSD.org>
>  -COMMENT= Text Renderer Framework
>  -WWW= https://pypi.org/project/zope.app.renderer/
>  -
>  -LICENSE= ZPL21
>  -
>  -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>=0.5:textproc/py-docutils@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}roman>=0:math/py-roman@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.structuredtext>=0:textproc/py-zope.structuredtext@${PY_FLAVOR}
>  -
>  -USES= python
>  -USE_PYTHON= distutils autoplist
>  -
>  -.include <bsd.port.mk>
>  diff --git a/devel/py-zope.app.renderer/distinfo b/devel/py-zope.app.renderer/distinfo
>  deleted file mode 100644
>  index 30f4389efa03..000000000000
>  --- a/devel/py-zope.app.renderer/distinfo
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  -SHA256 (zope/zope.app.renderer-3.5.1.tar.gz) = f316f717f30dd28c0b46317eee29dffe3feeefec3096dc4356fa9e242709f51f
>  -SIZE (zope/zope.app.renderer-3.5.1.tar.gz) = 7669
>  diff --git a/devel/py-zope.app.renderer/pkg-descr b/devel/py-zope.app.renderer/pkg-descr
>  deleted file mode 100644
>  index 41ea4f788476..000000000000
>  --- a/devel/py-zope.app.renderer/pkg-descr
>  +++ /dev/null
>  @@ -1 +0,0 @@
>  -Text Renderer Framework.
>  diff --git a/devel/py-zope.app.schema/Makefile b/devel/py-zope.app.schema/Makefile
>  deleted file mode 100644
>  index 3c1c38354a24..000000000000
>  --- a/devel/py-zope.app.schema/Makefile
>  +++ /dev/null
>  @@ -1,22 +0,0 @@
>  -PORTNAME= zope.app.schema
>  -PORTVERSION= 3.5.0
>  -PORTREVISION= 1
>  -CATEGORIES= devel python zope
>  -MASTER_SITES= PYPI
>  -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>  -DIST_SUBDIR= zope
>  -
>  -MAINTAINER= zope@FreeBSD.org <mailto:zope@FreeBSD.org>
>  -COMMENT= Component Architecture based Vocabulary Registry
>  -WWW= https://pypi.org/project/zope.app.schema/
>  -
>  -LICENSE= ZPL21
>  -
>  -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=0:devel/py-zope.component@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR}
>  -
>  -USES= python
>  -USE_PYTHON= distutils autoplist
>  -
>  -.include <bsd.port.mk>
>  diff --git a/devel/py-zope.app.schema/distinfo b/devel/py-zope.app.schema/distinfo
>  deleted file mode 100644
>  index 867a3f2f1192..000000000000
>  --- a/devel/py-zope.app.schema/distinfo
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  -SHA256 (zope/zope.app.schema-3.5.0.tar.gz) = 160078318460f403db79e5914b95de03d64d3f485b4bd931d183b4ce716ef3c4
>  -SIZE (zope/zope.app.schema-3.5.0.tar.gz) = 5586
>  diff --git a/devel/py-zope.app.schema/pkg-descr b/devel/py-zope.app.schema/pkg-descr
>  deleted file mode 100644
>  index a74c46bd374e..000000000000
>  --- a/devel/py-zope.app.schema/pkg-descr
>  +++ /dev/null
>  @@ -1 +0,0 @@
>  -Component Architecture based Vocabulary Registry.
>  diff --git a/devel/py-zope.broken/Makefile b/devel/py-zope.broken/Makefile
>  deleted file mode 100644
>  index 28d5fdaf4ce3..000000000000
>  --- a/devel/py-zope.broken/Makefile
>  +++ /dev/null
>  @@ -1,20 +0,0 @@
>  -PORTNAME= zope.broken
>  -PORTVERSION= 3.6.0
>  -PORTREVISION= 1
>  -CATEGORIES= devel python zope
>  -MASTER_SITES= PYPI
>  -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>  -DIST_SUBDIR= zope
>  -
>  -MAINTAINER= zope@FreeBSD.org <mailto:zope@FreeBSD.org>
>  -COMMENT= Zope Broken Object Interfaces
>  -WWW= https://pypi.org/project/zope.broken/
>  -
>  -LICENSE= ZPL21
>  -
>  -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
>  -
>  -USES= python zip
>  -USE_PYTHON= distutils autoplist
>  -
>  -.include <bsd.port.mk>
>  diff --git a/devel/py-zope.broken/distinfo b/devel/py-zope.broken/distinfo
>  deleted file mode 100644
>  index b6274c1e8249..000000000000
>  --- a/devel/py-zope.broken/distinfo
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  -SHA256 (zope/zope.broken-3.6.0.zip) = b9b8776002da4f7b6b12dfcce77eb642ae62b39586dbf60e1d9bdc992c9f2999
>  -SIZE (zope/zope.broken-3.6.0.zip) = 7617
>  diff --git a/devel/py-zope.broken/pkg-descr b/devel/py-zope.broken/pkg-descr
>  deleted file mode 100644
>  index 819c6184db72..000000000000
>  --- a/devel/py-zope.broken/pkg-descr
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  -This package is Zope Broken Object Interfaces and it is obsolete and
>  -its functionality has been merged into the ZODB3 distribution itself.
>  diff --git a/devel/py-zope.browserresource/Makefile b/devel/py-zope.browserresource/Makefile
>  deleted file mode 100644
>  index 108bd816c9bf..000000000000
>  --- a/devel/py-zope.browserresource/Makefile
>  +++ /dev/null
>  @@ -1,31 +0,0 @@
>  -PORTNAME= zope.browserresource
>  -PORTVERSION= 3.10.3
>  -PORTREVISION= 1
>  -PORTEPOCH= 1
>  -CATEGORIES= devel python zope
>  -MASTER_SITES= PYPI
>  -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>  -DIST_SUBDIR= zope
>  -
>  -MAINTAINER= zope@FreeBSD.org <mailto:zope@FreeBSD.org>
>  -COMMENT= Browser resources implementation for Zope
>  -WWW= https://pypi.org/project/zope.browserresource/
>  -
>  -LICENSE= ZPL21
>  -
>  -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.contenttype>=0:devel/py-zope.contenttype@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.i18n>=0:devel/py-zope.i18n@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=3.8:devel/py-zope.publisher@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.traversing>3.7:devel/py-zope.traversing@${PY_FLAVOR}
>  -
>  -USES= python zip
>  -USE_PYTHON= distutils autoplist
>  -
>  -NO_ARCH= yes
>  -
>  -.include <bsd.port.mk>
>  diff --git a/devel/py-zope.browserresource/distinfo b/devel/py-zope.browserresource/distinfo
>  deleted file mode 100644
>  index a6914480b60a..000000000000
>  --- a/devel/py-zope.browserresource/distinfo
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  -SHA256 (zope/zope.browserresource-3.10.3.zip) = 95ca1648ab53b43e9c1d728e075e7fdc4ec3e7533c00cf21b6c28bf43011112f
>  -SIZE (zope/zope.browserresource-3.10.3.zip) = 43274
>  diff --git a/devel/py-zope.browserresource/files/patch-2to3 b/devel/py-zope.browserresource/files/patch-2to3
>  deleted file mode 100644
>  index 9c237afe883f..000000000000
>  --- a/devel/py-zope.browserresource/files/patch-2to3
>  +++ /dev/null
>  @@ -1,20 +0,0 @@
>  ---- src/zope/browserresource/file.py.orig 2009-08-25 05:54:46 UTC
>  -+++ src/zope/browserresource/file.py
>  -@@ -164,14 +164,14 @@ class FileResource(BrowserView, Resource):
>  - # understand the screwy date string as a lucky side effect
>  - # of the way they parse it).
>  - try:
>  -- mod_since = long(mktime_tz(parsedate_tz(header)))
>  -+ mod_since = int(mktime_tz(parsedate_tz(header)))
>  - except:
>  - mod_since = None
>  - if mod_since is not None:
>  - if getattr(file, 'lmt', None):
>  -- last_mod = long(file.lmt)
>  -+ last_mod = int(file.lmt)
>  - else:
>  -- last_mod = 0L
>  -+ last_mod = 0
>  - if last_mod > 0 and last_mod <= mod_since:
>  - response.setStatus(304)
>  - return ''
>  diff --git a/devel/py-zope.browserresource/pkg-descr b/devel/py-zope.browserresource/pkg-descr
>  deleted file mode 100644
>  index 6bff12b5a4be..000000000000
>  --- a/devel/py-zope.browserresource/pkg-descr
>  +++ /dev/null
>  @@ -1,3 +0,0 @@
>  -This package provides an implementation of browser resources.
>  -It also provides directives for defining those resources using
>  -ZCML.
>  diff --git a/devel/py-zope.cachedescriptors/Makefile b/devel/py-zope.cachedescriptors/Makefile
>  deleted file mode 100644
>  index 539df24d855f..000000000000
>  --- a/devel/py-zope.cachedescriptors/Makefile
>  +++ /dev/null
>  @@ -1,18 +0,0 @@
>  -PORTNAME= zope.cachedescriptors
>  -PORTVERSION= 3.5.1
>  -PORTREVISION= 1
>  -CATEGORIES= devel python zope
>  -MASTER_SITES= PYPI
>  -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>  -DIST_SUBDIR= zope
>  -
>  -MAINTAINER= zope@FreeBSD.org <mailto:zope@FreeBSD.org>
>  -COMMENT= Method and property caching decorators
>  -WWW= https://pypi.org/project/zope.cachedescriptors/
>  -
>  -LICENSE= ZPL21
>  -
>  -USES= python zip
>  -USE_PYTHON= distutils autoplist
>  -
>  -.include <bsd.port.mk>
>  diff --git a/devel/py-zope.cachedescriptors/distinfo b/devel/py-zope.cachedescriptors/distinfo
>  deleted file mode 100644
>  index eb7cc3efcad9..000000000000
>  --- a/devel/py-zope.cachedescriptors/distinfo
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  -SHA256 (zope/zope.cachedescriptors-3.5.1.zip) = 6a37062ce6b17029521155d3301a3df2bf05ebd6a8ee0477a031435a4a2af3d0
>  -SIZE (zope/zope.cachedescriptors-3.5.1.zip) = 17822
>  diff --git a/devel/py-zope.cachedescriptors/files/patch-2to3 b/devel/py-zope.cachedescriptors/files/patch-2to3
>  deleted file mode 100644
>  index 0cc551192028..000000000000
>  --- a/devel/py-zope.cachedescriptors/files/patch-2to3
>  +++ /dev/null
>  @@ -1,11 +0,0 @@
>  ---- src/zope/cachedescriptors/property.py.orig 2007-05-09 07:11:30 UTC
>  -+++ src/zope/cachedescriptors/property.py
>  -@@ -16,7 +16,7 @@ See the CachedProperty class.
>  - $Id: property.py 75652 2007-05-09 13:11:30Z zagy $
>  - """
>  -
>  --ncaches = 0l
>  -+ncaches = 0
>  -
>  -
>  - class CachedProperty(object):
>  diff --git a/devel/py-zope.cachedescriptors/pkg-descr b/devel/py-zope.cachedescriptors/pkg-descr
>  deleted file mode 100644
>  index 0e14251c16bd..000000000000
>  --- a/devel/py-zope.cachedescriptors/pkg-descr
>  +++ /dev/null
>  @@ -1 +0,0 @@
>  -Method and property caching decorators.
>  diff --git a/devel/py-zope.contentprovider/Makefile b/devel/py-zope.contentprovider/Makefile
>  deleted file mode 100644
>  index a473f20a6e4b..000000000000
>  --- a/devel/py-zope.contentprovider/Makefile
>  +++ /dev/null
>  @@ -1,26 +0,0 @@
>  -PORTNAME= zope.contentprovider
>  -PORTVERSION= 3.7.2
>  -PORTREVISION= 1
>  -CATEGORIES= devel python zope
>  -MASTER_SITES= PYPI
>  -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>  -DIST_SUBDIR= zope
>  -
>  -MAINTAINER= zope@FreeBSD.org <mailto:zope@FreeBSD.org>
>  -COMMENT= Content Provider Framework for Zope Templates
>  -WWW= https://pypi.org/project/zope.contentprovider/
>  -
>  -LICENSE= ZPL21
>  -
>  -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.event>=0:devel/py-zope.event@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.location>=0:devel/py-zope.location@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.publisher>=0:devel/py-zope.publisher@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.schema>=3.5.1dev:devel/py-zope.schema@${PY_FLAVOR} \
>  - ${PYTHON_PKGNAMEPREFIX}zope.tales>=0:devel/py-zope.tales@${PY_FLAVOR}
>  -
>  -USES= python
>  -USE_PYTHON= distutils autoplist
>  -
>  -.include <bsd.port.mk>
>  diff --git a/devel/py-zope.contentprovider/distinfo b/devel/py-zope.contentprovider/distinfo
>  deleted file mode 100644
>  index b054dbde3d00..000000000000
>  --- a/devel/py-zope.contentprovider/distinfo
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  -SHA256 (zope/zope.contentprovider-3.7.2.tar.gz) = 672fbb3922974b1c23bad605e020c10ff5ca31c44abf45ac9cd08cbbecab3432
>  -SIZE (zope/zope.contentprovider-3.7.2.tar.gz) = 26596
>  diff --git a/devel/py-zope.contentprovider/pkg-descr b/devel/py-zope.contentprovider/pkg-descr
>  deleted file mode 100644
>  index a352f4e613a7..000000000000
>  --- a/devel/py-zope.contentprovider/pkg-descr
>  +++ /dev/null
>  @@ -1,5 +0,0 @@
>  -This package provides a framework to develop componentized Web
>  -GUI applications. Instead of describing the content of a page
>  -using a single template or static system of templates and METAL
>  -macros, content provider objects are dynamically looked up based
>  -on the setup/configuration of the application.
>  diff --git a/devel/py-zope.copy/Makefile b/devel/py-zope.copy/Makefile
>  deleted file mode 100644
>  index 4368ce1acda4..000000000000
>  --- a/devel/py-zope.copy/Makefile
>  +++ /dev/null
>  @@ -1,20 +0,0 @@
>  -PORTNAME= zope.copy
>  -PORTVERSION= 3.5.0
>  -PORTREVISION= 1
>  -CATEGORIES= devel python zope
>  -MASTER_SITES= PYPI
>  -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>  -DIST_SUBDIR= zope
>  -
>  -MAINTAINER= zope@FreeBSD.org <mailto:zope@FreeBSD.org>
>  -COMMENT= Pluggable object copying mechanism
>  -WWW= https://pypi.org/project/zope.copy/
>  -
>  -LICENSE= ZPL21
>  -
>  -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${PY_FLAVOR}
>  -
>  -USES= python
>  -USE_PYTHON= distutils autoplist
>  -
>  -.include <bsd.port.mk>
>  diff --git a/devel/py-zope.copy/distinfo b/devel/py-zope.copy/distinfo
>  deleted file mode 100644
>  index c692bf112e75..000000000000
>  --- a/devel/py-zope.copy/distinfo
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  -SHA256 (zope/zope.copy-3.5.0.tar.gz) = 2e95fa032946898a6e689bc48fa3444b0be1861c11545bf710431d8f9195a7fd
>  -SIZE (zope/zope.copy-3.5.0.tar.gz) = 9821
>  diff --git a/devel/py-zope.copy/pkg-descr b/devel/py-zope.copy/pkg-descr
>  deleted file mode 100644
>  index 897485578b20..000000000000
>  --- a/devel/py-zope.copy/pkg-descr
>  +++ /dev/null
>  @@ -1,4 +0,0 @@
>  -This package provides a pluggable way to copy persistent objects.
>  -It was once extracted from the zc.copy package to contain much
>  -less dependencies. In fact, we only depend on zope.interface to
>  -provide pluggability.
>  diff --git a/devel/py-zope.datetime/Makefile b/devel/py-zope.datetime/Makefile
>  deleted file mode 100644
>  index 107920914004..000000000000
>  --- a/devel/py-zope.datetime/Makefile
>  +++ /dev/null
>  @@ -1,18 +0,0 @@
>  -PORTNAME= zope.datetime
>  -PORTVERSION= 3.4.1
>  -PORTREVISION= 1
>  -CATEGORIES= devel python zope
>  -MASTER_SITES= PYPI
>  -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>  -DIST_SUBDIR= zope
>  -
>  -MAINTAINER= zope@FreeBSD.org <mailto:zope@FreeBSD.org>
>  -COMMENT= Commonly used date and time related utility functions
>  -WWW= https://pypi.org/project/zope.datetime/
>  -
>  -LICENSE= ZPL21
>  -
>  -USES= python
>  -USE_PYTHON= distutils autoplist
>  -
>  -.include <bsd.port.mk>
>  diff --git a/devel/py-zope.datetime/distinfo b/devel/py-zope.datetime/distinfo
>  deleted file mode 100644
>  index 8909844d3365..000000000000
>  --- a/devel/py-zope.datetime/distinfo
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  -SHA256 (zope/zope.datetime-3.4.1.tar.gz) = 373b8ed926ba18e2cf17e72011f7cecb0c4c35bbd0ede6cc0426e2e6e9b9c5b2
>  -SIZE (zope/zope.datetime-3.4.1.tar.gz) = 34171
>  diff --git a/devel/py-zope.datetime/files/patch-2to3 b/devel/py-zope.datetime/files/patch-2to3
>  deleted file mode 100644
>  index 085d5e1234e9..000000000000
>  --- a/devel/py-zope.datetime/files/patch-2to3
>  +++ /dev/null
>  @@ -1,167 +0,0 @@
>  ---- src/zope/datetime/__init__.py.orig 2011-11-29 16:29:14 UTC
>  -+++ src/zope/datetime/__init__.py
>  -@@ -87,7 +87,7 @@ i=int(yr-1)
>  - to_year =int(i*365+i/4-i/100+i/400-693960.0)
>  - to_month=tm[yr%4==0 and (yr%100!=0 or yr%400==0)][mo]
>  - EPOCH =(to_year+to_month+dy+(hr/24.0+mn/1440.0+sc/86400.0))*86400
>  --jd1901 =2415385L
>  -+jd1901 =2415385
>  -
>  -
>  - numericTimeZoneMatch=re.compile(r'[+-][0-9][0-9][0-9][0-9]').match #TS
>  -@@ -282,7 +282,7 @@ class _cache:
>  -
>  - def __init__(self):
>  - self._db = _data
>  -- self._d, self._zidx= {}, self._zmap.keys()
>  -+ self._d, self._zidx= {}, list(self._zmap.keys())
>  -
>  - def __getitem__(self,k):
>  - try: n=self._zmap[k.lower()]
>  -@@ -337,28 +337,28 @@ def _calcDependentSecond(tz, t):
>  - # Calculates the timezone-dependent second (integer part only)
>  - # from the timezone-independent second.
>  - fset = _tzoffset(tz, t)
>  -- return fset + long(math.floor(t)) + long(EPOCH) - 86400L
>  -+ return fset + int(math.floor(t)) + int(EPOCH) - 86400
>  -
>  - def _calcDependentSecond2(yr,mo,dy,hr,mn,sc):
>  - # Calculates the timezone-dependent second (integer part only)
>  - # from the date given.
>  - ss = int(hr) * 3600 + int(mn) * 60 + int(sc)
>  -- x = long(_julianday(yr,mo,dy)-jd1901) * 86400 + ss
>  -+ x = int(_julianday(yr,mo,dy)-jd1901) * 86400 + ss
>  - return x
>  -
>  - def _calcIndependentSecondEtc(tz, x, ms):
>  - # Derive the timezone-independent second from the timezone
>  - # dependent second.
>  - fsetAtEpoch = _tzoffset(tz, 0.0)
>  -- nearTime = x - fsetAtEpoch - long(EPOCH) + 86400L + ms
>  -+ nearTime = x - fsetAtEpoch - int(EPOCH) + 86400 + ms
>  - # nearTime is now within an hour of being correct.
>  - # Recalculate t according to DST.
>  -- fset = long(_tzoffset(tz, nearTime))
>  -+ fset = int(_tzoffset(tz, nearTime))
>  - x_adjusted = x - fset + ms
>  - d = x_adjusted / 86400.0
>  -- t = x_adjusted - long(EPOCH) + 86400L
>  -+ t = x_adjusted - int(EPOCH) + 86400
>  - millis = (x + 86400 - fset) * 1000 + \
>  -- long(ms * 1000.0) - long(EPOCH * 1000.0)
>  -+ int(ms * 1000.0) - int(EPOCH * 1000.0)
>  - s = d - math.floor(d)
>  - return s,d,t,millis
>  -
>  -@@ -382,34 +382,34 @@ def _calcYMDHMS(x, ms):
>  - return yr,mo,dy,hr,mn,sc
>  -
>  - def _julianday(yr,mo,dy):
>  -- y,m,d=long(yr),long(mo),long(dy)
>  -- if m > 12L:
>  -- y=y+m/12L
>  -- m=m%12L
>  -- elif m < 1L:
>  -+ y,m,d=int(yr),int(mo),int(dy)
>  -+ if m > 12:
>  -+ y=y+m/12
>  -+ m=m%12
>  -+ elif m < 1:
>  - m=-m
>  -- y=y-m/12L-1L
>  -- m=12L-m%12L
>  -- if y > 0L: yr_correct=0L
>  -- else: yr_correct=3L
>  -- if m < 3L: y, m=y-1L,m+12L
>  -- if y*10000L+m*100L+d > 15821014L: b=2L-y/100L+y/400L
>  -- else: b=0L
>  -- return (1461L*y-yr_correct)/4L+306001L*(m+1L)/10000L+d+1720994L+b
>  -+ y=y-m/12-1
>  -+ m=12-m%12
>  -+ if y > 0: yr_correct=0
>  -+ else: yr_correct=3
>  -+ if m < 3: y, m=y-1,m+12
>  -+ if y*10000+m*100+d > 15821014: b=2-y/100+y/400
>  -+ else: b=0
>  -+ return (1461*y-yr_correct)/4+306001*(m+1)/10000+d+1720994+b
>  -
>  - def _calendarday(j):
>  -- j=long(j)
>  -- if(j < 2299160L):
>  -- b=j+1525L
>  -+ j=int(j)
>  -+ if(j < 2299160):
>  -+ b=j+1525
>  - else:
>  -- a=(4L*j-7468861L)/146097L
>  -- b=j+1526L+a-a/4L
>  -- c=(20L*b-2442L)/7305L
>  -- d=1461L*c/4L
>  -- e=10000L*(b-d)/306001L
>  -- dy=int(b-d-306001L*e/10000L)
>  -- mo=(e < 14L) and int(e-1L) or int(e-13L)
>  -- yr=(mo > 2) and (c-4716L) or (c-4715L)
>  -+ a=(4*j-7468861)/146097
>  -+ b=j+1526+a-a/4
>  -+ c=(20*b-2442)/7305
>  -+ d=1461*c/4
>  -+ e=10000*(b-d)/306001
>  -+ dy=int(b-d-306001*e/10000)
>  -+ mo=(e < 14) and int(e-1) or int(e-13)
>  -+ yr=(mo > 2) and (c-4716) or (c-4715)
>  - return int(yr),int(mo),int(dy)
>  -
>  - def _tzoffset(tz, t):
>  -@@ -619,7 +619,7 @@ class DateTimeParser:
>  - if not self._multipleZones:
>  - return self._localzone0
>  - fsetAtEpoch = _tzoffset(self._localzone0, 0.0)
>  -- nearTime = x - fsetAtEpoch - long(EPOCH) + 86400L + ms
>  -+ nearTime = x - fsetAtEpoch - int(EPOCH) + 86400 + ms
>  - # nearTime is within an hour of being correct.
>  - try:
>  - ltm = safelocaltime(nearTime)
>  -@@ -631,7 +631,7 @@ class DateTimeParser:
>  - yr,mo,dy,hr,mn,sc = _calcYMDHMS(x, 0)
>  - yr = ((yr - 1970) % 28) + 1970
>  - x = _calcDependentSecond2(yr,mo,dy,hr,mn,sc)
>  -- nearTime = x - fsetAtEpoch - long(EPOCH) + 86400L + ms
>  -+ nearTime = x - fsetAtEpoch - int(EPOCH) + 86400 + ms
>  - ltm = safelocaltime(nearTime)
>  - tz = self.localZone(ltm)
>  - return tz
>  ---- src/zope/datetime/timezones.py.orig 2011-11-29 16:29:14 UTC
>  -+++ src/zope/datetime/timezones.py
>  -@@ -1178,23 +1178,23 @@ historical_zone_info = {
>  -
>  - def dumpTimezoneInfo(_data):
>  -
>  -- print "historical_zone_info = {"
>  -+ print("historical_zone_info = {")
>  -
>  -- items = _data.items()
>  -+ items = list(_data.items())
>  - items.sort()
>  - for key, value in items:
>  - v1, v2, v3, ilist, bitmap, two_by_three, two_nullterm = value
>  -- print "'%s': ('%s', %s, %s," % (key, v1, v2, v3)
>  -- print "[",
>  -+ print("'%s': ('%s', %s, %s," % (key, v1, v2, v3))
>  -+ print("[", end=' ')
>  - while ilist:
>  - next_5, ilist = ilist[:5], ilist[5:]
>  - line = ", ".join(["'%s'" % x for x in next_5])
>  -- print "%s," % line
>  -- print "], "
>  -- print "%s," % repr(bitmap)
>  -- print "%s, %s)," % (repr(two_by_three), repr(two_nullterm))
>  -+ print("%s," % line)
>  -+ print("], ")
>  -+ print("%s," % repr(bitmap))
>  -+ print("%s, %s)," % (repr(two_by_three), repr(two_nullterm)))
>  -
>  -- print "}"
>  -+ print("}")
>  -
>  - if __name__ == '__main__':
>  - dumpTimezoneInfo(historical_zone_info)
>  diff --git a/devel/py-zope.datetime/pkg-descr b/devel/py-zope.datetime/pkg-descr
>  deleted file mode 100644
>  index 99d2ceda8e68..000000000000
>  --- a/devel/py-zope.datetime/pkg-descr
>  +++ /dev/null
>  @@ -1,2 +0,0 @@
>  *** 1012 LINES SKIPPED ***
> 
> 
> --
> Regards,
> Ruslan
>