aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2018-04-25 16:42:37 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2018-04-25 16:42:37 +0000
commitc63740208199641936685ceb327218d7e846b7c8 (patch)
tree5816208a1a58cec4948e059798f42fb162cd7327
parent55caf841166c6b623c560ed35330457f97311a2e (diff)
downloadports-c63740208199641936685ceb327218d7e846b7c8.tar.gz
ports-c63740208199641936685ceb327218d7e846b7c8.zip
Notes
-rw-r--r--archivers/py-borgbackup/pkg-descr2
-rw-r--r--archivers/py-czipfile/pkg-descr2
-rw-r--r--archivers/py-python-lzo/pkg-descr2
-rw-r--r--archivers/py-warctools/pkg-descr2
-rw-r--r--archivers/py-xopen/pkg-descr2
-rw-r--r--astro/py-astLib/pkg-descr2
-rw-r--r--astro/py-pymetar/pkg-descr2
-rw-r--r--audio/py-mpd/pkg-descr2
-rw-r--r--audio/py-py-jack/pkg-descr2
-rw-r--r--audio/py-pymad/pkg-descr2
-rw-r--r--biology/py-cutadapt/pkg-descr2
-rw-r--r--biology/py-pysam/pkg-descr2
-rw-r--r--comms/py-hidapi/pkg-descr2
-rw-r--r--converters/py-better-bencode/pkg-descr2
-rw-r--r--converters/py-pint/pkg-descr2
-rw-r--r--converters/py-unidecode/pkg-descr2
-rw-r--r--converters/py-zfec/pkg-descr2
-rw-r--r--converters/zbase32/pkg-descr2
-rw-r--r--databases/nagios-check_postgres_replication/pkg-descr2
-rw-r--r--databases/py-dbf/pkg-descr2
-rw-r--r--databases/py-flask-sqlalchemy/pkg-descr2
-rw-r--r--databases/py-geoalchemy/pkg-descr2
-rw-r--r--databases/py-geoalchemy2/pkg-descr2
-rw-r--r--databases/py-influxdb/pkg-descr2
-rw-r--r--databases/py-leveldb/pkg-descr2
-rw-r--r--databases/py-motor/pkg-descr2
-rw-r--r--databases/py-mycli/pkg-descr2
-rw-r--r--databases/py-pgcli/pkg-descr2
-rw-r--r--databases/py-pgspecial/pkg-descr2
-rw-r--r--databases/py-pickledb/pkg-descr2
-rw-r--r--databases/py-pyhs/pkg-descr2
-rw-r--r--databases/py-python-memcached/pkg-descr2
-rw-r--r--databases/py-sqlparse/pkg-descr2
-rw-r--r--databases/py-sqlparse020/pkg-descr2
-rw-r--r--databases/py-tarantool/pkg-descr2
-rw-r--r--databases/py-zodbpickle/pkg-descr2
-rw-r--r--deskutils/py-pystash/pkg-descr2
-rw-r--r--devel/bbfreeze-loader/pkg-descr2
-rw-r--r--devel/bbfreeze/pkg-descr2
-rw-r--r--devel/cram/pkg-descr2
-rw-r--r--devel/hgsvn/pkg-descr2
-rw-r--r--devel/pep8/pkg-descr2
-rw-r--r--devel/py-Acquisition/pkg-descr2
-rw-r--r--devel/py-BytecodeAssembler/pkg-descr2
-rw-r--r--devel/py-DateTime/pkg-descr2
-rw-r--r--devel/py-DocumentTemplate/pkg-descr2
-rw-r--r--devel/py-ExtensionClass/pkg-descr2
-rw-r--r--devel/py-Faker/pkg-descr2
-rw-r--r--devel/py-Missing/pkg-descr2
-rw-r--r--devel/py-MultiMapping/pkg-descr2
-rw-r--r--devel/py-PEAK-Rules/pkg-descr2
-rw-r--r--devel/py-Persistence/pkg-descr2
-rw-r--r--devel/py-Pint/pkg-descr2
-rw-r--r--devel/py-Products.ATContentTypes/pkg-descr2
-rw-r--r--devel/py-Products.ATReferenceBrowserWidget/pkg-descr2
-rw-r--r--devel/py-Products.Archetypes/pkg-descr2
-rw-r--r--devel/py-Products.BTreeFolder2/pkg-descr2
-rw-r--r--devel/py-Products.CMFActionIcons/pkg-descr2
-rw-r--r--devel/py-Products.CMFCalendar/pkg-descr2
-rw-r--r--devel/py-Products.CMFCore/pkg-descr2
-rw-r--r--devel/py-Products.CMFDefault/pkg-descr2
-rw-r--r--devel/py-Products.CMFDiffTool/pkg-descr2
-rw-r--r--devel/py-Products.CMFDynamicViewFTI/pkg-descr2
-rw-r--r--devel/py-Products.CMFEditions/pkg-descr2
-rw-r--r--devel/py-Products.CMFFormController/pkg-descr2
-rw-r--r--devel/py-Products.CMFPlacefulWorkflow/pkg-descr2
-rw-r--r--devel/py-Products.CMFQuickInstallerTool/pkg-descr2
-rw-r--r--devel/py-Products.CMFUid/pkg-descr2
-rw-r--r--devel/py-Products.DCWorkflow/pkg-descr2
-rw-r--r--devel/py-Products.ExtendedPathIndex/pkg-descr2
-rw-r--r--devel/py-Products.ExternalEditor/pkg-descr2
-rw-r--r--devel/py-Products.ExternalMethod/pkg-descr2
-rw-r--r--devel/py-Products.GenericSetup/pkg-descr2
-rw-r--r--devel/py-Products.LDAPMultiPlugins/pkg-descr2
-rw-r--r--devel/py-Products.LDAPUserFolder/pkg-descr2
-rw-r--r--devel/py-Products.MIMETools/pkg-descr2
-rw-r--r--devel/py-Products.Marshall/pkg-descr2
-rw-r--r--devel/py-Products.MimetypesRegistry/pkg-descr2
-rw-r--r--devel/py-Products.OFSP/pkg-descr2
-rw-r--r--devel/py-Products.PasswordResetTool/pkg-descr2
-rw-r--r--devel/py-Products.PlacelessTranslationService/pkg-descr2
-rw-r--r--devel/py-Products.PloneLanguageTool/pkg-descr2
-rw-r--r--devel/py-Products.PluginRegistry/pkg-descr2
-rw-r--r--devel/py-Products.PortalTransforms/pkg-descr2
-rw-r--r--devel/py-Products.PythonScripts/pkg-descr2
-rw-r--r--devel/py-Products.ResourceRegistries/pkg-descr2
-rw-r--r--devel/py-Products.StandardCacheManagers/pkg-descr2
-rw-r--r--devel/py-Products.ZCTextIndex/pkg-descr2
-rw-r--r--devel/py-Products.ZCatalog/pkg-descr2
-rw-r--r--devel/py-Products.ZSQLMethods/pkg-descr2
-rw-r--r--devel/py-Products.ZopeVersionControl/pkg-descr2
-rw-r--r--devel/py-Products.contentmigration/pkg-descr2
-rw-r--r--devel/py-Products.statusmessages/pkg-descr2
-rw-r--r--devel/py-Products.validation/pkg-descr2
-rw-r--r--devel/py-PyExecJS/pkg-descr2
-rw-r--r--devel/py-Record/pkg-descr2
-rw-r--r--devel/py-XStatic-Angular-Bootstrap/pkg-descr2
-rw-r--r--devel/py-XStatic-Angular-FileUpload/pkg-descr2
-rw-r--r--devel/py-XStatic-Angular-Gettext/pkg-descr2
-rw-r--r--devel/py-XStatic-Angular-Schema-Form/pkg-descr2
-rw-r--r--devel/py-XStatic-Angular-lrdragndrop/pkg-descr2
-rw-r--r--devel/py-XStatic-Angular/pkg-descr2
-rw-r--r--devel/py-XStatic-Bootstrap-Datepicker/pkg-descr2
-rw-r--r--devel/py-XStatic-Bootstrap-SCSS/pkg-descr2
-rw-r--r--devel/py-XStatic-D3/pkg-descr2
-rw-r--r--devel/py-XStatic-Font-Awesome/pkg-descr2
-rw-r--r--devel/py-XStatic-Hogan/pkg-descr2
-rw-r--r--devel/py-XStatic-JQuery-Migrate/pkg-descr2
-rw-r--r--devel/py-XStatic-JQuery.TableSorter/pkg-descr2
-rw-r--r--devel/py-XStatic-JQuery.quicksearch/pkg-descr2
-rw-r--r--devel/py-XStatic-JSEncrypt/pkg-descr2
-rw-r--r--devel/py-XStatic-Jasmine/pkg-descr2
-rw-r--r--devel/py-XStatic-Rickshaw/pkg-descr2
-rw-r--r--devel/py-XStatic-Spin/pkg-descr2
-rw-r--r--devel/py-XStatic-bootswatch/pkg-descr2
-rw-r--r--devel/py-XStatic-jQuery/pkg-descr2
-rw-r--r--devel/py-XStatic-jquery-ui/pkg-descr2
-rw-r--r--devel/py-XStatic-mdi/pkg-descr2
-rw-r--r--devel/py-XStatic-objectpath/pkg-descr2
-rw-r--r--devel/py-XStatic-roboto-fontface/pkg-descr2
-rw-r--r--devel/py-XStatic-smart-table/pkg-descr2
-rw-r--r--devel/py-XStatic-term.js/pkg-descr2
-rw-r--r--devel/py-XStatic-tv4/pkg-descr2
-rw-r--r--devel/py-XStatic/pkg-descr2
-rw-r--r--devel/py-ZopeUndo/pkg-descr2
-rw-r--r--devel/py-anyconfig/pkg-descr2
-rw-r--r--devel/py-application/pkg-descr2
-rw-r--r--devel/py-apscheduler/pkg-descr2
-rw-r--r--devel/py-archetypes.querywidget/pkg-descr2
-rw-r--r--devel/py-archetypes.referencebrowserwidget/pkg-descr2
-rw-r--r--devel/py-archetypes.schemaextender/pkg-descr2
-rw-r--r--devel/py-argcomplete/pkg-descr2
-rw-r--r--devel/py-astor/pkg-descr2
-rw-r--r--devel/py-astroid/pkg-descr2
-rw-r--r--devel/py-asttokens/pkg-descr2
-rw-r--r--devel/py-async_generator/pkg-descr2
-rw-r--r--devel/py-atomiclong/pkg-descr2
-rw-r--r--devel/py-automaton/pkg-descr2
-rw-r--r--devel/py-avro/pkg-descr2
-rw-r--r--devel/py-backports.csv/pkg-descr2
-rw-r--r--devel/py-backports.functools_lru_cache/pkg-descr2
-rw-r--r--devel/py-bitarray/pkg-descr2
-rw-r--r--devel/py-bitstring/pkg-descr2
-rw-r--r--devel/py-castellan/pkg-descr2
-rw-r--r--devel/py-celery/pkg-descr2
-rw-r--r--devel/py-check-manifest/pkg-descr2
-rw-r--r--devel/py-cli-helpers/pkg-descr2
-rw-r--r--devel/py-click-plugins/pkg-descr2
-rw-r--r--devel/py-cliff/pkg-descr2
-rw-r--r--devel/py-cluster/pkg-descr2
-rw-r--r--devel/py-cmd2/pkg-descr2
-rw-r--r--devel/py-collective.monkeypatcher/pkg-descr2
-rw-r--r--devel/py-collective.z3cform.datetimewidget/pkg-descr2
-rw-r--r--devel/py-colorama/pkg-descr2
-rw-r--r--devel/py-colorlog/pkg-descr2
-rw-r--r--devel/py-conditional/pkg-descr2
-rw-r--r--devel/py-configargparse/pkg-descr2
-rw-r--r--devel/py-configparser/pkg-descr2
-rw-r--r--devel/py-confusable_homoglyphs/pkg-descr2
-rw-r--r--devel/py-constantly/pkg-descr2
-rw-r--r--devel/py-contextlib2/pkg-descr2
-rw-r--r--devel/py-country/pkg-descr2
-rw-r--r--devel/py-cursive/pkg-descr2
-rw-r--r--devel/py-curtsies/pkg-descr2
-rw-r--r--devel/py-cycler/pkg-descr2
-rw-r--r--devel/py-daemon-runner/pkg-descr2
-rw-r--r--devel/py-daemon/pkg-descr2
-rw-r--r--devel/py-daemons/pkg-descr2
-rw-r--r--devel/py-darcsver/pkg-descr2
-rw-r--r--devel/py-darts.util.lru/pkg-descr2
-rw-r--r--devel/py-dateutils/pkg-descr2
-rw-r--r--devel/py-decoratortools/pkg-descr2
-rw-r--r--devel/py-deprecation/pkg-descr2
-rw-r--r--devel/py-diazo/pkg-descr2
-rw-r--r--devel/py-dill/pkg-descr2
-rw-r--r--devel/py-dis3/pkg-descr2
-rw-r--r--devel/py-editdistance/pkg-descr2
-rw-r--r--devel/py-eggtestinfo/pkg-descr2
-rw-r--r--devel/py-ejson/pkg-descr2
-rw-r--r--devel/py-enum-compat/pkg-descr2
-rw-r--r--devel/py-enum34/pkg-descr2
-rw-r--r--devel/py-epsilon/pkg-descr2
-rw-r--r--devel/py-evdev/pkg-descr2
-rw-r--r--devel/py-eventlib/pkg-descr2
-rw-r--r--devel/py-extras/pkg-descr2
-rw-r--r--devel/py-extremes/pkg-descr2
-rw-r--r--devel/py-ezpyinline/pkg-descr2
-rw-r--r--devel/py-fastimport/pkg-descr2
-rw-r--r--devel/py-first/pkg-descr2
-rw-r--r--devel/py-five.customerize/pkg-descr2
-rw-r--r--devel/py-five.formlib/pkg-descr2
-rw-r--r--devel/py-five.globalrequest/pkg-descr2
-rw-r--r--devel/py-five.localsitemanager/pkg-descr2
-rw-r--r--devel/py-fixtures/pkg-descr2
-rw-r--r--devel/py-flake8-builtins/pkg-descr2
-rw-r--r--devel/py-flake8-docstrings/pkg-descr2
-rw-r--r--devel/py-flake8-import-order/pkg-descr2
-rw-r--r--devel/py-flake8-polyfill/pkg-descr2
-rw-r--r--devel/py-flake8-quotes/pkg-descr2
-rw-r--r--devel/py-flake8/pkg-descr2
-rw-r--r--devel/py-flask-babel/pkg-descr2
-rw-r--r--devel/py-flexmock/pkg-descr2
-rw-r--r--devel/py-foolscap/pkg-descr2
-rw-r--r--devel/py-fusepy/pkg-descr2
-rw-r--r--devel/py-futurist/pkg-descr2
-rw-r--r--devel/py-fuzzywuzzy/pkg-descr2
-rw-r--r--devel/py-geojson/pkg-descr2
-rw-r--r--devel/py-gevent/pkg-descr2
-rw-r--r--devel/py-git-up/pkg-descr2
-rw-r--r--devel/py-git_semver/pkg-descr2
-rw-r--r--devel/py-gitdb2/pkg-descr2
-rw-r--r--devel/py-glance-store/pkg-descr2
-rw-r--r--devel/py-google-apputils/pkg-descr2
-rw-r--r--devel/py-greenlet/pkg-descr2
-rw-r--r--devel/py-grpcio-tools/pkg-descr2
-rw-r--r--devel/py-grpcio/pkg-descr2
-rw-r--r--devel/py-gtfslib/pkg-descr2
-rw-r--r--devel/py-hash_ring/pkg-descr2
-rw-r--r--devel/py-http-prompt/pkg-descr2
-rw-r--r--devel/py-incremental/pkg-descr2
-rw-r--r--devel/py-inflect/pkg-descr2
-rw-r--r--devel/py-initgroups/pkg-descr2
-rw-r--r--devel/py-ipdb/pkg-descr2
-rw-r--r--devel/py-ipython_genutils/pkg-descr2
-rw-r--r--devel/py-isodate/pkg-descr2
-rw-r--r--devel/py-isort/pkg-descr2
-rw-r--r--devel/py-iterpipes/pkg-descr2
-rw-r--r--devel/py-jaraco.classes/pkg-descr2
-rw-r--r--devel/py-jaraco.functools/pkg-descr2
-rw-r--r--devel/py-jaraco.logging/pkg-descr2
-rw-r--r--devel/py-jaraco.util/pkg-descr2
-rw-r--r--devel/py-jcc/pkg-descr2
-rw-r--r--devel/py-jsmin/pkg-descr2
-rw-r--r--devel/py-jsonlib/pkg-descr2
-rw-r--r--devel/py-jsonlib2/pkg-descr2
-rw-r--r--devel/py-jsonlines/pkg-descr2
-rw-r--r--devel/py-jsonpointer/pkg-descr2
-rw-r--r--devel/py-jsonref/pkg-descr2
-rw-r--r--devel/py-jsonrpclib-pelix/pkg-descr2
-rw-r--r--devel/py-kaptan/pkg-descr2
-rw-r--r--devel/py-kayako/pkg-descr2
-rw-r--r--devel/py-kazoo/pkg-descr2
-rw-r--r--devel/py-kitchen/pkg-descr2
-rw-r--r--devel/py-lazy-object-proxy/pkg-descr2
-rw-r--r--devel/py-lazy/pkg-descr2
-rw-r--r--devel/py-levenshtein/pkg-descr2
-rw-r--r--devel/py-libtaxii/pkg-descr2
-rw-r--r--devel/py-libtmux/pkg-descr2
-rw-r--r--devel/py-libusb1/pkg-descr2
-rw-r--r--devel/py-libversion/pkg-descr2
-rw-r--r--devel/py-linecache2/pkg-descr2
-rw-r--r--devel/py-logan/pkg-descr2
-rw-r--r--devel/py-logilab-common/pkg-descr2
-rw-r--r--devel/py-manuel/pkg-descr2
-rw-r--r--devel/py-marshmallow/pkg-descr2
-rw-r--r--devel/py-mccabe/pkg-descr2
-rw-r--r--devel/py-mdv/pkg-descr2
-rw-r--r--devel/py-memory_profiler/pkg-descr2
-rw-r--r--devel/py-microversion-parse/pkg-descr2
-rw-r--r--devel/py-mock/pkg-descr2
-rw-r--r--devel/py-mox/pkg-descr2
-rw-r--r--devel/py-multipledispatch/pkg-descr2
-rw-r--r--devel/py-mwlib.rl/pkg-descr2
-rw-r--r--devel/py-mwlib/pkg-descr2
-rw-r--r--devel/py-nagioscheck/pkg-descr2
-rw-r--r--devel/py-naiveBayesClassifier/pkg-descr2
-rw-r--r--devel/py-nose-cov/pkg-descr2
-rw-r--r--devel/py-oletools/pkg-descr2
-rw-r--r--devel/py-openstacksdk/pkg-descr2
-rw-r--r--devel/py-opster/pkg-descr2
-rw-r--r--devel/py-ordereddict/pkg-descr2
-rw-r--r--devel/py-os-brick/pkg-descr2
-rw-r--r--devel/py-os-client-config/pkg-descr2
-rw-r--r--devel/py-os-vif/pkg-descr2
-rw-r--r--devel/py-os-win/pkg-descr2
-rw-r--r--devel/py-osc-lib/pkg-descr2
-rw-r--r--devel/py-oslo.cache/pkg-descr2
-rw-r--r--devel/py-oslo.concurrency/pkg-descr2
-rw-r--r--devel/py-oslo.context/pkg-descr2
-rw-r--r--devel/py-oslo.db/pkg-descr2
-rw-r--r--devel/py-oslo.log/pkg-descr2
-rw-r--r--devel/py-oslo.messaging/pkg-descr2
-rw-r--r--devel/py-oslo.middleware/pkg-descr2
-rw-r--r--devel/py-oslo.privsep/pkg-descr2
-rw-r--r--devel/py-oslo.reports/pkg-descr2
-rw-r--r--devel/py-oslo.rootwrap/pkg-descr2
-rw-r--r--devel/py-oslo.service/pkg-descr2
-rw-r--r--devel/py-oslo.versionedobjects/pkg-descr2
-rw-r--r--devel/py-oslo.vmware/pkg-descr2
-rw-r--r--devel/py-osprofiler/pkg-descr2
-rw-r--r--devel/py-packaging/pkg-descr2
-rw-r--r--devel/py-pathlib/pkg-descr2
-rw-r--r--devel/py-pathlib2/pkg-descr2
-rw-r--r--devel/py-pep8-naming/pkg-descr2
-rw-r--r--devel/py-period/pkg-descr2
-rw-r--r--devel/py-petname/pkg-descr2
-rw-r--r--devel/py-pew/pkg-descr2
-rw-r--r--devel/py-phply/pkg-descr2
-rw-r--r--devel/py-pid/pkg-descr2
-rw-r--r--devel/py-pinocchio/pkg-descr2
-rw-r--r--devel/py-pip-tools/pkg-descr2
-rw-r--r--devel/py-pkgconfig/pkg-descr2
-rw-r--r--devel/py-pluggy/pkg-descr2
-rw-r--r--devel/py-prettytable/pkg-descr2
-rw-r--r--devel/py-prioritized_methods/pkg-descr2
-rw-r--r--devel/py-ptvsd/pkg-descr2
-rw-r--r--devel/py-pudb/pkg-descr2
-rw-r--r--devel/py-pycalendar/pkg-descr2
-rw-r--r--devel/py-pycmd/pkg-descr2
-rw-r--r--devel/py-pycodestyle/pkg-descr2
-rw-r--r--devel/py-pydevd/pkg-descr2
-rw-r--r--devel/py-pydocstyle/pkg-descr2
-rw-r--r--devel/py-pyflakes/pkg-descr2
-rw-r--r--devel/py-pygpx/pkg-descr2
-rw-r--r--devel/py-pyicu/pkg-descr2
-rw-r--r--devel/py-pyinstaller/pkg-descr2
-rw-r--r--devel/py-pylru-cache/pkg-descr2
-rw-r--r--devel/py-pymarc/pkg-descr2
-rw-r--r--devel/py-pyparsing/pkg-descr2
-rw-r--r--devel/py-pyrfc3339/pkg-descr2
-rw-r--r--devel/py-pytest-asyncio/pkg-descr2
-rw-r--r--devel/py-pytest-django/pkg-descr2
-rw-r--r--devel/py-pytest-flake8/pkg-descr2
-rw-r--r--devel/py-pytest-sugar/pkg-descr2
-rw-r--r--devel/py-pytest-tornado/pkg-descr2
-rw-r--r--devel/py-python-gist/pkg-descr2
-rw-r--r--devel/py-pytools/pkg-descr2
-rw-r--r--devel/py-pyutil/pkg-descr2
-rw-r--r--devel/py-pyvalid/pkg-descr2
-rw-r--r--devel/py-pyvisa-py/pkg-descr2
-rw-r--r--devel/py-pyvisa/pkg-descr2
-rw-r--r--devel/py-pyxml2obj/pkg-descr2
-rw-r--r--devel/py-raven/pkg-descr2
-rw-r--r--devel/py-repoze.what-pylons/pkg-descr2
-rw-r--r--devel/py-repoze.xmliter/pkg-descr2
-rw-r--r--devel/py-requestsexceptions/pkg-descr2
-rw-r--r--devel/py-rlcompleter2/pkg-descr2
-rw-r--r--devel/py-rply/pkg-descr2
-rw-r--r--devel/py-rtslib-fb/pkg-descr2
-rw-r--r--devel/py-rubymarshal/pkg-descr2
-rw-r--r--devel/py-rwt/pkg-descr2
-rw-r--r--devel/py-selection/pkg-descr2
-rw-r--r--devel/py-selectors34/pkg-descr2
-rw-r--r--devel/py-serpent/pkg-descr2
-rw-r--r--devel/py-setproctitle/pkg-descr2
-rw-r--r--devel/py-setuptools-git/pkg-descr2
-rw-r--r--devel/py-setuptools/pkg-descr2
-rw-r--r--devel/py-setuptools_darcs/pkg-descr2
-rw-r--r--devel/py-setuptools_hg/pkg-descr2
-rw-r--r--devel/py-shapely/pkg-descr2
-rw-r--r--devel/py-should_dsl/pkg-descr2
-rw-r--r--devel/py-simplegeneric/pkg-descr2
-rw-r--r--devel/py-simplejson/pkg-descr2
-rw-r--r--devel/py-singledispatch/pkg-descr2
-rw-r--r--devel/py-six/pkg-descr2
-rw-r--r--devel/py-smmap2/pkg-descr2
-rw-r--r--devel/py-sourcemap/pkg-descr2
-rw-r--r--devel/py-speaklater/pkg-descr2
-rw-r--r--devel/py-statsd/pkg-descr2
-rw-r--r--devel/py-stdnum/pkg-descr2
-rw-r--r--devel/py-stopit/pkg-descr2
-rw-r--r--devel/py-tapi/pkg-descr2
-rw-r--r--devel/py-tarantool-queue/pkg-descr2
-rw-r--r--devel/py-tblib/pkg-descr2
-rw-r--r--devel/py-tempora/pkg-descr2
-rw-r--r--devel/py-tempstorage/pkg-descr2
-rw-r--r--devel/py-tenacity/pkg-descr2
-rw-r--r--devel/py-termcolor/pkg-descr2
-rw-r--r--devel/py-testresources/pkg-descr2
-rw-r--r--devel/py-testscenarios/pkg-descr2
-rw-r--r--devel/py-testtools/pkg-descr2
-rw-r--r--devel/py-timelib/pkg-descr2
-rw-r--r--devel/py-tipper/pkg-descr2
-rw-r--r--devel/py-tooz/pkg-descr2
-rw-r--r--devel/py-trace2html/pkg-descr2
-rw-r--r--devel/py-traceback2/pkg-descr2
-rw-r--r--devel/py-traitlets/pkg-descr2
-rw-r--r--devel/py-traits/pkg-descr2
-rw-r--r--devel/py-transaction/pkg-descr2
-rw-r--r--devel/py-twine/pkg-descr2
-rw-r--r--devel/py-typing/pkg-descr2
-rw-r--r--devel/py-tzlocal/pkg-descr2
-rw-r--r--devel/py-unittest2/pkg-descr2
-rw-r--r--devel/py-validators/pkg-descr2
-rw-r--r--devel/py-validictory/pkg-descr2
-rw-r--r--devel/py-venusian/pkg-descr2
-rw-r--r--devel/py-versiontools/pkg-descr2
-rw-r--r--devel/py-warlock/pkg-descr2
-rw-r--r--devel/py-weblib/pkg-descr2
-rw-r--r--devel/py-websockify/pkg-descr2
-rw-r--r--devel/py-wrapt/pkg-descr2
-rw-r--r--devel/py-wsgi_intercept/pkg-descr2
-rw-r--r--devel/py-wsme/pkg-descr2
-rw-r--r--devel/py-xdis/pkg-descr2
-rw-r--r--devel/py-xmltodict/pkg-descr2
-rw-r--r--devel/py-xxhash/pkg-descr2
-rw-r--r--devel/py-yandex-money-sdk/pkg-descr2
-rw-r--r--devel/py-yappi/pkg-descr2
-rw-r--r--devel/py-yunomi/pkg-descr2
-rw-r--r--devel/py-z3c.autoinclude/pkg-descr2
-rw-r--r--devel/py-z3c.batching/pkg-descr2
-rw-r--r--devel/py-z3c.caching/pkg-descr2
-rw-r--r--devel/py-z3c.form/pkg-descr2
-rw-r--r--devel/py-z3c.formwidget.query/pkg-descr2
-rw-r--r--devel/py-z3c.zcmlhook/pkg-descr2
-rw-r--r--devel/py-zExceptions/pkg-descr2
-rw-r--r--devel/py-zLOG/pkg-descr2
-rw-r--r--devel/py-zc.buildout/pkg-descr2
-rw-r--r--devel/py-zclockfile/pkg-descr2
-rw-r--r--devel/py-zconfig/pkg-descr2
-rw-r--r--devel/py-zkpython/pkg-descr2
-rw-r--r--devel/py-zope.annotation/pkg-descr2
-rw-r--r--devel/py-zope.app.applicationcontrol/pkg-descr2
-rw-r--r--devel/py-zope.app.appsetup/pkg-descr2
-rw-r--r--devel/py-zope.app.basicskin/pkg-descr2
-rw-r--r--devel/py-zope.app.broken/pkg-descr2
-rw-r--r--devel/py-zope.app.cache/pkg-descr2
-rw-r--r--devel/py-zope.app.component/pkg-descr2
-rw-r--r--devel/py-zope.app.container/pkg-descr2
-rw-r--r--devel/py-zope.app.content/pkg-descr2
-rw-r--r--devel/py-zope.app.debug/pkg-descr2
-rw-r--r--devel/py-zope.app.dependable/pkg-descr2
-rw-r--r--devel/py-zope.app.error/pkg-descr2
-rw-r--r--devel/py-zope.app.exception/pkg-descr2
-rw-r--r--devel/py-zope.app.file/pkg-descr2
-rw-r--r--devel/py-zope.app.folder/pkg-descr2
-rw-r--r--devel/py-zope.app.form/pkg-descr2
-rw-r--r--devel/py-zope.app.generations/pkg-descr2
-rw-r--r--devel/py-zope.app.http/pkg-descr2
-rw-r--r--devel/py-zope.app.pagetemplate/pkg-descr2
-rw-r--r--devel/py-zope.app.publication/pkg-descr2
-rw-r--r--devel/py-zope.app.publisher/pkg-descr2
-rw-r--r--devel/py-zope.app.renderer/pkg-descr2
-rw-r--r--devel/py-zope.app.rotterdam/pkg-descr2
-rw-r--r--devel/py-zope.app.schema/pkg-descr2
-rw-r--r--devel/py-zope.app.testing/pkg-descr2
-rw-r--r--devel/py-zope.app.zcmlfiles/pkg-descr2
-rw-r--r--devel/py-zope.app.zopeappgenerations/pkg-descr2
-rw-r--r--devel/py-zope.applicationcontrol/pkg-descr2
-rw-r--r--devel/py-zope.broken/pkg-descr2
-rw-r--r--devel/py-zope.browser/pkg-descr2
-rw-r--r--devel/py-zope.browsermenu/pkg-descr2
-rw-r--r--devel/py-zope.browserpage/pkg-descr2
-rw-r--r--devel/py-zope.browserresource/pkg-descr2
-rw-r--r--devel/py-zope.cachedescriptors/pkg-descr2
-rw-r--r--devel/py-zope.component/pkg-descr2
-rw-r--r--devel/py-zope.componentvocabulary/pkg-descr2
-rw-r--r--devel/py-zope.configuration/pkg-descr2
-rw-r--r--devel/py-zope.container/pkg-descr2
-rw-r--r--devel/py-zope.contentprovider/pkg-descr2
-rw-r--r--devel/py-zope.contenttype/pkg-descr2
-rw-r--r--devel/py-zope.copy/pkg-descr2
-rw-r--r--devel/py-zope.copypastemove/pkg-descr2
-rw-r--r--devel/py-zope.datetime/pkg-descr2
-rw-r--r--devel/py-zope.deferredimport/pkg-descr2
-rw-r--r--devel/py-zope.deprecation/pkg-descr2
-rw-r--r--devel/py-zope.dottedname/pkg-descr2
-rw-r--r--devel/py-zope.dublincore/pkg-descr2
-rw-r--r--devel/py-zope.error/pkg-descr2
-rw-r--r--devel/py-zope.event/pkg-descr2
-rw-r--r--devel/py-zope.exceptions/pkg-descr2
-rw-r--r--devel/py-zope.filerepresentation/pkg-descr2
-rw-r--r--devel/py-zope.formlib/pkg-descr2
-rw-r--r--devel/py-zope.generations/pkg-descr2
-rw-r--r--devel/py-zope.globalrequest/pkg-descr2
-rw-r--r--devel/py-zope.interface/pkg-descr2
-rw-r--r--devel/py-zope.lifecycleevent/pkg-descr2
-rw-r--r--devel/py-zope.location/pkg-descr2
-rw-r--r--devel/py-zope.minmax/pkg-descr2
-rw-r--r--devel/py-zope.pagetemplate/pkg-descr2
-rw-r--r--devel/py-zope.processlifetime/pkg-descr2
-rw-r--r--devel/py-zope.ptresource/pkg-descr2
-rw-r--r--devel/py-zope.publisher/pkg-descr2
-rw-r--r--devel/py-zope.ramcache/pkg-descr2
-rw-r--r--devel/py-zope.schema/pkg-descr2
-rw-r--r--devel/py-zope.sequencesort/pkg-descr2
-rw-r--r--devel/py-zope.site/pkg-descr2
-rw-r--r--devel/py-zope.size/pkg-descr2
-rw-r--r--devel/py-zope.tales/pkg-descr2
-rw-r--r--devel/py-zope.testbrowser/pkg-descr2
-rw-r--r--devel/py-zope.testing/pkg-descr2
-rw-r--r--devel/py-zope.traversing/pkg-descr2
-rw-r--r--devel/py-zope.viewlet/pkg-descr2
-rw-r--r--devel/py_static_check/pkg-descr2
-rw-r--r--devel/pylint/pkg-descr2
-rw-r--r--devel/pythk/pkg-descr2
-rw-r--r--dns/py-idna_ssl/pkg-descr2
-rw-r--r--dns/py-publicsuffix/pkg-descr2
-rw-r--r--dns/py-py3dns/pkg-descr2
-rw-r--r--dns/py-pycares/pkg-descr2
-rw-r--r--ftp/py-pycurl/pkg-descr2
-rw-r--r--graphics/py-blockdiagcontrib-cisco/pkg-descr2
-rw-r--r--graphics/py-django-easy-thumbnails/pkg-descr2
-rw-r--r--graphics/py-djvulibre/pkg-descr2
-rw-r--r--graphics/py-gphoto2/pkg-descr2
-rw-r--r--graphics/py-pivy/pkg-descr2
-rw-r--r--graphics/py-poppler-qt4/pkg-descr2
-rw-r--r--graphics/py-pyganim/pkg-descr2
-rw-r--r--graphics/py-pyglet/pkg-descr2
-rw-r--r--graphics/py-toyplot/pkg-descr2
-rw-r--r--graphics/pymorph/pkg-descr2
-rw-r--r--mail/py-Products.MailHost/pkg-descr2
-rw-r--r--mail/py-Products.SecureMailHost/pkg-descr2
-rw-r--r--mail/py-pyspf/pkg-descr2
-rw-r--r--mail/py-zope.sendmail/pkg-descr2
-rw-r--r--math/py-altgraph/pkg-descr2
-rw-r--r--math/py-colormath/pkg-descr2
-rw-r--r--math/py-fastcluster/pkg-descr2
-rw-r--r--math/py-fpconst/pkg-descr2
-rw-r--r--math/py-gmpy2/pkg-descr2
-rw-r--r--math/py-intspan/pkg-descr2
-rw-r--r--math/py-mathdom/pkg-descr2
-rw-r--r--math/py-numexpr/pkg-descr2
-rw-r--r--math/py-patsy/pkg-descr2
-rw-r--r--math/py-pyasp/pkg-descr2
-rw-r--r--math/py-pyhull/pkg-descr2
-rw-r--r--math/py-pymc/pkg-descr2
-rw-r--r--math/py-roman/pkg-descr2
-rw-r--r--misc/py-YABT/pkg-descr2
-rw-r--r--misc/py-colorbrewer/pkg-descr2
-rw-r--r--misc/py-crudini/pkg-descr2
-rw-r--r--misc/py-fuzzy/pkg-descr2
-rw-r--r--misc/py-progressbar/pkg-descr2
-rw-r--r--misc/py-progressbar2/pkg-descr2
-rw-r--r--misc/py-progressbar231/pkg-descr2
-rw-r--r--misc/py-python-geohash/pkg-descr2
-rw-r--r--misc/py-python-utils/pkg-descr2
-rw-r--r--misc/py-yolk/pkg-descr2
-rw-r--r--multimedia/py-moviepy/pkg-descr2
-rw-r--r--multimedia/py-tvnamer/pkg-descr2
-rw-r--r--net-mgmt/py-adal/pkg-descr2
-rw-r--r--net-mgmt/py-ipcalc/pkg-descr2
-rw-r--r--net-mgmt/py-ipy/pkg-descr2
-rw-r--r--net-mgmt/py-msrest/pkg-descr2
-rw-r--r--net-mgmt/py-msrestazure/pkg-descr2
-rw-r--r--net/py-coherence/pkg-descr2
-rw-r--r--net/py-cymruwhois/pkg-descr2
-rw-r--r--net/py-gspreadsheet/pkg-descr2
-rw-r--r--net/py-haproxy-log-analysis/pkg-descr2
-rw-r--r--net/py-ipaddress/pkg-descr2
-rw-r--r--net/py-iplib/pkg-descr2
-rw-r--r--net/py-matrix-synapse-ldap3/pkg-descr2
-rw-r--r--net/py-ndg_httpsclient/pkg-descr2
-rw-r--r--net/py-netifaces/pkg-descr2
-rw-r--r--net/py-netlib/pkg-descr2
-rw-r--r--net/py-netsnmpagent/pkg-descr2
-rw-r--r--net/py-ntplib/pkg-descr2
-rw-r--r--net/py-oauth/pkg-descr2
-rw-r--r--net/py-pyshark/pkg-descr2
-rw-r--r--net/py-pystun/pkg-descr2
-rw-r--r--net/py-python-barbicanclient/pkg-descr2
-rw-r--r--net/py-python-ceilometerclient/pkg-descr2
-rw-r--r--net/py-python-cinderclient/pkg-descr2
-rw-r--r--net/py-python-designateclient/pkg-descr2
-rw-r--r--net/py-python-glanceclient/pkg-descr2
-rw-r--r--net/py-python-heatclient/pkg-descr2
-rw-r--r--net/py-python-keystoneclient/pkg-descr2
-rw-r--r--net/py-python-neutronclient/pkg-descr2
-rw-r--r--net/py-python-ntlm/pkg-descr2
-rw-r--r--net/py-python-openstackclient/pkg-descr2
-rw-r--r--net/py-smart_open/pkg-descr2
-rw-r--r--net/py-soap2py/pkg-descr2
-rw-r--r--net/py-suds-jurko/pkg-descr2
-rw-r--r--net/py-txamqp/pkg-descr2
-rw-r--r--net/py-txrestapi/pkg-descr2
-rw-r--r--net/py-urllib3/pkg-descr2
-rw-r--r--net/py-zope.proxy/pkg-descr2
-rw-r--r--net/pyrad/pkg-descr2
-rw-r--r--news/py-pynzb/pkg-descr2
-rw-r--r--print/py-pycups/pkg-descr2
-rw-r--r--print/py-relatorio/pkg-descr2
-rw-r--r--science/py-cdo/pkg-descr2
-rw-r--r--science/py-coards/pkg-descr2
-rw-r--r--science/py-h5py/pkg-descr2
-rw-r--r--science/py-pupynere/pkg-descr2
-rw-r--r--science/py-pyaixi/pkg-descr2
-rw-r--r--science/py-pysal/pkg-descr2
-rw-r--r--science/py-pyteomics.biolccc/pkg-descr2
-rw-r--r--science/py-pyteomics/pkg-descr2
-rw-r--r--science/py-scimath/pkg-descr2
-rw-r--r--security/pssh/pkg-descr2
-rw-r--r--security/py-AccessControl/pkg-descr2
-rw-r--r--security/py-Products.PlonePAS/pkg-descr2
-rw-r--r--security/py-Products.PluggableAuthService/pkg-descr2
-rw-r--r--security/py-RestrictedPython/pkg-descr2
-rw-r--r--security/py-SecretStorage/pkg-descr2
-rw-r--r--security/py-YubiOTP/pkg-descr2
-rw-r--r--security/py-borg.localrole/pkg-descr2
-rw-r--r--security/py-certifi/pkg-descr2
-rw-r--r--security/py-gnutls/pkg-descr2
-rw-r--r--security/py-google-auth/pkg-descr2
-rw-r--r--security/py-halberd/pkg-descr2
-rw-r--r--security/py-keyrings.alt/pkg-descr2
-rw-r--r--security/py-m2crypto/pkg-descr2
-rw-r--r--security/py-oauth2client/pkg-descr2
-rw-r--r--security/py-pgpdump/pkg-descr2
-rw-r--r--security/py-plone.app.openid/pkg-descr2
-rw-r--r--security/py-plone.keyring/pkg-descr2
-rw-r--r--security/py-plone.openid/pkg-descr2
-rw-r--r--security/py-plone.protect/pkg-descr2
-rw-r--r--security/py-plone.session/pkg-descr2
-rw-r--r--security/py-pynacl/pkg-descr2
-rw-r--r--security/py-python3-openid/pkg-descr2
-rw-r--r--security/py-safe/pkg-descr2
-rw-r--r--security/py-scrypt/pkg-descr2
-rw-r--r--security/py-ssh/pkg-descr2
-rw-r--r--security/py-virustotal-api/pkg-descr2
-rw-r--r--security/py-vulndb/pkg-descr2
-rw-r--r--security/py-zope.app.authentication/pkg-descr2
-rw-r--r--security/py-zope.app.localpermission/pkg-descr2
-rw-r--r--security/py-zope.app.principalannotation/pkg-descr2
-rw-r--r--security/py-zope.app.security/pkg-descr2
-rw-r--r--security/py-zope.app.securitypolicy/pkg-descr2
-rw-r--r--security/py-zope.authentication/pkg-descr2
-rw-r--r--security/py-zope.login/pkg-descr2
-rw-r--r--security/py-zope.password/pkg-descr2
-rw-r--r--security/py-zope.pluggableauth/pkg-descr2
-rw-r--r--security/py-zope.principalannotation/pkg-descr2
-rw-r--r--security/py-zope.principalregistry/pkg-descr2
-rw-r--r--security/py-zope.security/pkg-descr2
-rw-r--r--security/py-zope.securitypolicy/pkg-descr2
-rw-r--r--security/py-zope.session/pkg-descr2
-rw-r--r--security/py-zxcvbn/pkg-descr2
-rw-r--r--sysutils/py-croniter/pkg-descr2
-rw-r--r--sysutils/py-crontab/pkg-descr2
-rw-r--r--sysutils/py-pkginfo/pkg-descr2
-rw-r--r--sysutils/py-psutil/pkg-descr2
-rw-r--r--sysutils/py-psutil121/pkg-descr2
-rw-r--r--sysutils/py-pywatchman/pkg-descr2
-rw-r--r--sysutils/py-salt/pkg-descr2
-rw-r--r--sysutils/py-scriptine/pkg-descr2
-rw-r--r--sysutils/py-tmuxp/pkg-descr2
-rw-r--r--sysutils/py-zdaemon/pkg-descr2
-rw-r--r--textproc/py-CommonMark/pkg-descr2
-rw-r--r--textproc/py-MarkupSafe/pkg-descr2
-rw-r--r--textproc/py-awesome-slugify/pkg-descr2
-rw-r--r--textproc/py-cjkwrap/pkg-descr2
-rw-r--r--textproc/py-cloud_sptheme/pkg-descr2
-rw-r--r--textproc/py-colorclass/pkg-descr2
-rw-r--r--textproc/py-creole/pkg-descr2
-rw-r--r--textproc/py-elasticsearch-async/pkg-descr2
-rw-r--r--textproc/py-enchant/pkg-descr2
-rw-r--r--textproc/py-errorhandler/pkg-descr2
-rw-r--r--textproc/py-esmre/pkg-descr2
-rw-r--r--textproc/py-gambit-elasticsearch/pkg-descr2
-rw-r--r--textproc/py-guess-language/pkg-descr2
-rw-r--r--textproc/py-hexdump/pkg-descr2
-rw-r--r--textproc/py-html2text/pkg-descr2
-rw-r--r--textproc/py-hunspell/pkg-descr2
-rw-r--r--textproc/py-hypua2jamo/pkg-descr2
-rw-r--r--textproc/py-jaxml/pkg-descr2
-rw-r--r--textproc/py-pager/pkg-descr2
-rw-r--r--textproc/py-parsimonious/pkg-descr2
-rw-r--r--textproc/py-pyctpp2/pkg-descr2
-rw-r--r--textproc/py-pygtail/pkg-descr2
-rw-r--r--textproc/py-pyhwp/pkg-descr2
-rw-r--r--textproc/py-pylons-sphinx-themes/pkg-descr2
-rw-r--r--textproc/py-pyphen/pkg-descr2
-rw-r--r--textproc/py-pystemmer/pkg-descr2
-rw-r--r--textproc/py-python-gettext/pkg-descr2
-rw-r--r--textproc/py-rdflib/pkg-descr2
-rw-r--r--textproc/py-regex/pkg-descr2
-rw-r--r--textproc/py-snowballstemmer/pkg-descr2
-rw-r--r--textproc/py-sparqlwrapper/pkg-descr2
-rw-r--r--textproc/py-sphinx-intl/pkg-descr2
-rw-r--r--textproc/py-sphinxcontrib-adadomain/pkg-descr2
-rw-r--r--textproc/py-sphinxcontrib-fulltoc/pkg-descr2
-rw-r--r--textproc/py-stemming/pkg-descr2
-rw-r--r--textproc/py-tabletext/pkg-descr2
-rw-r--r--textproc/py-terminaltables/pkg-descr2
-rw-r--r--textproc/py-texttable/pkg-descr2
-rw-r--r--textproc/py-tinycss/pkg-descr2
-rw-r--r--textproc/py-toronado/pkg-descr2
-rw-r--r--textproc/py-trans/pkg-descr2
-rw-r--r--textproc/py-translationstring/pkg-descr2
-rw-r--r--textproc/py-whoosh/pkg-descr2
-rw-r--r--textproc/py-wicked/pkg-descr2
-rw-r--r--textproc/py-zope.app.i18n/pkg-descr2
-rw-r--r--textproc/py-zope.app.locales/pkg-descr2
-rw-r--r--textproc/py-zope.i18nmessageid/pkg-descr2
-rw-r--r--textproc/py-zope.structuredtext/pkg-descr2
-rw-r--r--textproc/py-zope.tal/pkg-descr2
-rw-r--r--www/butterfly/pkg-descr2
-rw-r--r--www/py-Products.PloneLDAP/pkg-descr2
-rw-r--r--www/py-WebError/pkg-descr2
-rw-r--r--www/py-azure-common/pkg-descr2
-rw-r--r--www/py-azure-storage/pkg-descr2
-rw-r--r--www/py-collective.easytemplate/pkg-descr2
-rw-r--r--www/py-collective.templateengines/pkg-descr2
-rw-r--r--www/py-cssmin/pkg-descr2
-rw-r--r--www/py-cssutils/pkg-descr2
-rw-r--r--www/py-django-babel/pkg-descr2
-rw-r--r--www/py-django-bootstrap-form/pkg-descr2
-rw-r--r--www/py-django-braces/pkg-descr2
-rw-r--r--www/py-django-countries/pkg-descr2
-rw-r--r--www/py-django-crispy-forms/pkg-descr2
-rw-r--r--www/py-django-datetime-widget/pkg-descr2
-rw-r--r--www/py-django-debug-toolbar/pkg-descr2
-rw-r--r--www/py-django-filer/pkg-descr2
-rw-r--r--www/py-django-guardian/pkg-descr2
-rw-r--r--www/py-django-htmlmin/pkg-descr2
-rw-r--r--www/py-django-markwhat/pkg-descr2
-rw-r--r--www/py-django-model-utils/pkg-descr2
-rw-r--r--www/py-django-otp-yubikey/pkg-descr2
-rw-r--r--www/py-django-picklefield/pkg-descr2
-rw-r--r--www/py-django-pyscss/pkg-descr2
-rw-r--r--www/py-django-reversion/pkg-descr2
-rw-r--r--www/py-django-signals-ahoy/pkg-descr2
-rw-r--r--www/py-django-simple-captcha/pkg-descr2
-rw-r--r--www/py-django_openstack_auth/pkg-descr2
-rw-r--r--www/py-flask-compress/pkg-descr2
-rw-r--r--www/py-flask-uploads/pkg-descr2
-rw-r--r--www/py-google-api-core/pkg-descr2
-rw-r--r--www/py-google-cloud-core/pkg-descr2
-rw-r--r--www/py-google-cloud-storage/pkg-descr2
-rw-r--r--www/py-google-resumable-media/pkg-descr2
-rw-r--r--www/py-html/pkg-descr2
-rw-r--r--www/py-hyperlink/pkg-descr2
-rw-r--r--www/py-libsass/pkg-descr2
-rw-r--r--www/py-nevow/pkg-descr2
-rw-r--r--www/py-pastescript/pkg-descr2
-rw-r--r--www/py-planet/pkg-descr2
-rw-r--r--www/py-plone.alterego/pkg-descr2
-rw-r--r--www/py-plone.app.blob/pkg-descr2
-rw-r--r--www/py-plone.app.caching/pkg-descr2
-rw-r--r--www/py-plone.app.collection/pkg-descr2
-rw-r--r--www/py-plone.app.content/pkg-descr2
-rw-r--r--www/py-plone.app.contentlisting/pkg-descr2
-rw-r--r--www/py-plone.app.contentmenu/pkg-descr2
-rw-r--r--www/py-plone.app.contentrules/pkg-descr2
-rw-r--r--www/py-plone.app.controlpanel/pkg-descr2
-rw-r--r--www/py-plone.app.customerize/pkg-descr2
-rw-r--r--www/py-plone.app.discussion/pkg-descr2
-rw-r--r--www/py-plone.app.folder/pkg-descr2
-rw-r--r--www/py-plone.app.form/pkg-descr2
-rw-r--r--www/py-plone.app.i18n/pkg-descr2
-rw-r--r--www/py-plone.app.imaging/pkg-descr2
-rw-r--r--www/py-plone.app.iterate/pkg-descr2
-rw-r--r--www/py-plone.app.jquery/pkg-descr2
-rw-r--r--www/py-plone.app.jquerytools/pkg-descr2
-rw-r--r--www/py-plone.app.layout/pkg-descr2
-rw-r--r--www/py-plone.app.ldap/pkg-descr2
-rw-r--r--www/py-plone.app.linkintegrity/pkg-descr2
-rw-r--r--www/py-plone.app.locales/pkg-descr2
-rw-r--r--www/py-plone.app.portlets/pkg-descr2
-rw-r--r--www/py-plone.app.querystring/pkg-descr2
-rw-r--r--www/py-plone.app.redirector/pkg-descr2
-rw-r--r--www/py-plone.app.registry/pkg-descr2
-rw-r--r--www/py-plone.app.search/pkg-descr2
-rw-r--r--www/py-plone.app.testing/pkg-descr2
-rw-r--r--www/py-plone.app.textfield/pkg-descr2
-rw-r--r--www/py-plone.app.theming/pkg-descr2
-rw-r--r--www/py-plone.app.upgrade/pkg-descr2
-rw-r--r--www/py-plone.app.users/pkg-descr2
-rw-r--r--www/py-plone.app.uuid/pkg-descr2
-rw-r--r--www/py-plone.app.viewletmanager/pkg-descr2
-rw-r--r--www/py-plone.app.vocabularies/pkg-descr2
-rw-r--r--www/py-plone.app.workflow/pkg-descr2
-rw-r--r--www/py-plone.app.z3cform/pkg-descr2
-rw-r--r--www/py-plone.autoform/pkg-descr2
-rw-r--r--www/py-plone.batching/pkg-descr2
-rw-r--r--www/py-plone.behavior/pkg-descr2
-rw-r--r--www/py-plone.browserlayer/pkg-descr2
-rw-r--r--www/py-plone.cachepurging/pkg-descr2
-rw-r--r--www/py-plone.caching/pkg-descr2
-rw-r--r--www/py-plone.contentrules/pkg-descr2
-rw-r--r--www/py-plone.fieldsets/pkg-descr2
-rw-r--r--www/py-plone.folder/pkg-descr2
-rw-r--r--www/py-plone.formwidget.namedfile/pkg-descr2
-rw-r--r--www/py-plone.i18n/pkg-descr2
-rw-r--r--www/py-plone.indexer/pkg-descr2
-rw-r--r--www/py-plone.intelligenttext/pkg-descr2
-rw-r--r--www/py-plone.locking/pkg-descr2
-rw-r--r--www/py-plone.memoize/pkg-descr2
-rw-r--r--www/py-plone.namedfile/pkg-descr2
-rw-r--r--www/py-plone.outputfilters/pkg-descr2
-rw-r--r--www/py-plone.portlet.collection/pkg-descr2
-rw-r--r--www/py-plone.portlet.static/pkg-descr2
-rw-r--r--www/py-plone.portlets/pkg-descr2
-rw-r--r--www/py-plone.registry/pkg-descr2
-rw-r--r--www/py-plone.resource/pkg-descr2
-rw-r--r--www/py-plone.rfc822/pkg-descr2
-rw-r--r--www/py-plone.scale/pkg-descr2
-rw-r--r--www/py-plone.stringinterp/pkg-descr2
-rw-r--r--www/py-plone.subrequest/pkg-descr2
-rw-r--r--www/py-plone.supermodel/pkg-descr2
-rw-r--r--www/py-plone.synchronize/pkg-descr2
-rw-r--r--www/py-plone.theme/pkg-descr2
-rw-r--r--www/py-plone.transformchain/pkg-descr2
-rw-r--r--www/py-plone.uuid/pkg-descr2
-rw-r--r--www/py-plone.z3cform/pkg-descr2
-rw-r--r--www/py-plonetheme.classic/pkg-descr2
-rw-r--r--www/py-plonetheme.sunburst/pkg-descr2
-rw-r--r--www/py-pyquery/pkg-descr2
-rw-r--r--www/py-pyramid_rpc/pkg-descr2
-rw-r--r--www/py-python-dotenv/pkg-descr2
-rw-r--r--www/py-recaptcha/pkg-descr2
-rw-r--r--www/py-requests-mock/pkg-descr2
-rw-r--r--www/py-rfc3987/pkg-descr2
-rw-r--r--www/py-selector/pkg-descr2
-rw-r--r--www/py-sockjs-tornado/pkg-descr2
-rw-r--r--www/py-spyne/pkg-descr2
-rw-r--r--www/py-swapper/pkg-descr2
-rw-r--r--www/py-tmdb3/pkg-descr2
-rw-r--r--www/py-tvdb_api/pkg-descr2
-rw-r--r--www/py-uliweb/pkg-descr2
-rw-r--r--www/py-user_agent/pkg-descr2
-rw-r--r--www/py-waitress/pkg-descr2
-rw-r--r--www/py-wsgiauth/pkg-descr2
-rw-r--r--www/py-zope.app.wsgi/pkg-descr2
-rw-r--r--www/uwsgitop/pkg-descr2
-rw-r--r--x11-fonts/py-bdflib/pkg-descr2
-rw-r--r--x11-toolkits/py-Pmw/pkg-descr2
-rw-r--r--x11-toolkits/py-SquareMap/pkg-descr2
-rw-r--r--x11-toolkits/py-kiwi-gtk/pkg-descr2
-rw-r--r--x11/py-xdot/pkg-descr2
-rw-r--r--x11/py-xdot06/pkg-descr2
817 files changed, 817 insertions, 817 deletions
diff --git a/archivers/py-borgbackup/pkg-descr b/archivers/py-borgbackup/pkg-descr
index 8426561bc2bb..4bc8ec6bfb4d 100644
--- a/archivers/py-borgbackup/pkg-descr
+++ b/archivers/py-borgbackup/pkg-descr
@@ -8,4 +8,4 @@ The data deduplication technique used makes Borg suitable for daily backups
since only changes are stored. The authenticated encryption technique makes it
suitable for backups to not fully trusted targets.
-WWW: https://pypi.python.org/pypi/borgbackup
+WWW: https://pypi.org/project/borgbackup/
diff --git a/archivers/py-czipfile/pkg-descr b/archivers/py-czipfile/pkg-descr
index 37620ebe2e04..c65b2d2f6d31 100644
--- a/archivers/py-czipfile/pkg-descr
+++ b/archivers/py-czipfile/pkg-descr
@@ -4,4 +4,4 @@ provides much faster, C-based zipfile decryption. The code is actually
modifications to allow it to compile in Cython, and the _ZipDecrypter
class adapted to take advantage of native C datatypes.
-WWW: https://pypi.python.org/pypi/czipfile
+WWW: https://pypi.org/project/czipfile/
diff --git a/archivers/py-python-lzo/pkg-descr b/archivers/py-python-lzo/pkg-descr
index 2fd66859fa7b..e36bb3e741c9 100644
--- a/archivers/py-python-lzo/pkg-descr
+++ b/archivers/py-python-lzo/pkg-descr
@@ -7,4 +7,4 @@ requires no memory.
In addition there are slower compression levels achieving a quite competitive
compression ratio while still decompressing at this very high speed.
-WWW: https://pypi.python.org/pypi/python-lzo
+WWW: https://pypi.org/project/python-lzo/
diff --git a/archivers/py-warctools/pkg-descr b/archivers/py-warctools/pkg-descr
index 84bbaf6a6468..9a6aefa243c9 100644
--- a/archivers/py-warctools/pkg-descr
+++ b/archivers/py-warctools/pkg-descr
@@ -1,4 +1,4 @@
Command line tools and libraries for handling and manipulating ISO 28500
WARC files and their HTTP contents.
-WWW: https://pypi.python.org/pypi/warctools
+WWW: https://pypi.org/project/warctools/
diff --git a/archivers/py-xopen/pkg-descr b/archivers/py-xopen/pkg-descr
index f3639b8054d0..fdcbbe51d19a 100644
--- a/archivers/py-xopen/pkg-descr
+++ b/archivers/py-xopen/pkg-descr
@@ -3,4 +3,4 @@ open function, but can also deal with compressed files. Supported compression
formats are gzip, bzip2 and xz. They are automatically recognized by their file
extensions .gz, .bz2 or .xz.
-WWW: https://pypi.python.org/pypi/xopen
+WWW: https://pypi.org/project/xopen/
diff --git a/astro/py-astLib/pkg-descr b/astro/py-astLib/pkg-descr
index c61bce6129cb..1664d411996b 100644
--- a/astro/py-astLib/pkg-descr
+++ b/astro/py-astLib/pkg-descr
@@ -4,4 +4,4 @@ coordinate conversions, and manipulating FITS images with World Coordinate
System (WCS) information through PyWCSTools - a simple wrapping of WCSTools by
Jessica Mink. PyWCSTools is distributed (and developed) as part of astLib.
-WWW: https://pypi.python.org/pypi/astLib
+WWW: https://pypi.org/project/astLib/
diff --git a/astro/py-pymetar/pkg-descr b/astro/py-pymetar/pkg-descr
index 2e85d28bd046..9d895b965444 100644
--- a/astro/py-pymetar/pkg-descr
+++ b/astro/py-pymetar/pkg-descr
@@ -2,5 +2,5 @@ Pymetar is a python module and command line tool designed to fetch Metar
reports from the NOAA (http://www.noaa.gov) and allow access to the
included weather information.
-WWW: https://pypi.python.org/pypi/pymetar
+WWW: https://pypi.org/project/pymetar/
WWW: https://github.com/klausman/pymetar
diff --git a/audio/py-mpd/pkg-descr b/audio/py-mpd/pkg-descr
index 9478f64d6f29..4ecf74816902 100644
--- a/audio/py-mpd/pkg-descr
+++ b/audio/py-mpd/pkg-descr
@@ -1,3 +1,3 @@
An MPD (Music Player Daemon) client library written in pure Python.
-WWW: https://pypi.python.org/pypi/python-mpd
+WWW: https://pypi.org/project/python-mpd/
diff --git a/audio/py-py-jack/pkg-descr b/audio/py-py-jack/pkg-descr
index f253becb3c34..ff60449ff0df 100644
--- a/audio/py-py-jack/pkg-descr
+++ b/audio/py-py-jack/pkg-descr
@@ -3,4 +3,4 @@ For information about Jack see http://jackit.sourceforge.net. This
enables a Python program to connect to and interact with pro-audio
applications which use the Jack Audio Server.
-WWW: https://pypi.python.org/pypi/py-jack
+WWW: https://pypi.org/project/py-jack/
diff --git a/audio/py-pymad/pkg-descr b/audio/py-pymad/pkg-descr
index 51e9986f2a56..cda8a80bac56 100644
--- a/audio/py-pymad/pkg-descr
+++ b/audio/py-pymad/pkg-descr
@@ -2,4 +2,4 @@ pymad is a Python module that allows Python programs to use the MPEG Audio
Decoder library. pymad provides a high-level API, similar to the pyogg module,
which makes reading PCM data from MPEG audio streams a piece of cake.
-WWW: https://pypi.python.org/pypi/pymad
+WWW: https://pypi.org/project/pymad/
diff --git a/biology/py-cutadapt/pkg-descr b/biology/py-cutadapt/pkg-descr
index d0d9bb3c620c..43fe420cb3b5 100644
--- a/biology/py-cutadapt/pkg-descr
+++ b/biology/py-cutadapt/pkg-descr
@@ -1,4 +1,4 @@
Cutadapt finds and removes adapter sequences, primers, poly-A tails and other
types of unwanted sequences from your high-throughput sequencing reads.
-WWW: https://pypi.python.org/pypi/cutadapt
+WWW: https://pypi.org/project/cutadapt/
diff --git a/biology/py-pysam/pkg-descr b/biology/py-pysam/pkg-descr
index 3278584b89c1..6f24ec8cf6f7 100644
--- a/biology/py-pysam/pkg-descr
+++ b/biology/py-pysam/pkg-descr
@@ -7,4 +7,4 @@ This module provides a low-level wrapper around the htslib C-API as using
cython and a high-level API for convenient access to the data within standard
genomic file formats.
-WWW: https://pypi.python.org/pypi/pysam
+WWW: https://pypi.org/project/pysam/
diff --git a/comms/py-hidapi/pkg-descr b/comms/py-hidapi/pkg-descr
index dfe8a35bd2c5..0786cbcb16fa 100644
--- a/comms/py-hidapi/pkg-descr
+++ b/comms/py-hidapi/pkg-descr
@@ -1,3 +1,3 @@
Cython interface to comms/hidapi.
-WWW: https://pypi.python.org/pypi/hidapi
+WWW: https://pypi.org/project/hidapi/
diff --git a/converters/py-better-bencode/pkg-descr b/converters/py-better-bencode/pkg-descr
index 27b244c164b5..1b4a697c028f 100644
--- a/converters/py-better-bencode/pkg-descr
+++ b/converters/py-better-bencode/pkg-descr
@@ -1,3 +1,3 @@
Fast, standard compliant Bencode serialization.
-WWW: https://pypi.python.org/pypi/better-bencode
+WWW: https://pypi.org/project/better-bencode/
diff --git a/converters/py-pint/pkg-descr b/converters/py-pint/pkg-descr
index e39f67ceecf1..8035f4dd981a 100644
--- a/converters/py-pint/pkg-descr
+++ b/converters/py-pint/pkg-descr
@@ -7,5 +7,5 @@ constants. Due to its modular design, you can extend (or even rewrite!) the
complete list without changing the source code. It supports a lot of numpy
mathematical operations without monkey patching or wrapping numpy.
-WWW: https://pypi.python.org/pypi/Pint
+WWW: https://pypi.org/project/Pint/
WWW: https://github.com/hgrecco/pint
diff --git a/converters/py-unidecode/pkg-descr b/converters/py-unidecode/pkg-descr
index f7aea2cf190f..c96aaf6cfb6e 100644
--- a/converters/py-unidecode/pkg-descr
+++ b/converters/py-unidecode/pkg-descr
@@ -5,4 +5,4 @@ The representation is almost always an attempt at *transliteration*
-- i.e., conveying, in Roman letters, the pronunciation expressed by
the text in some other writing system. (See the example above)
-WWW: https://pypi.python.org/pypi/Unidecode
+WWW: https://pypi.org/project/Unidecode/
diff --git a/converters/py-zfec/pkg-descr b/converters/py-zfec/pkg-descr
index de075ad6704f..6797762d9305 100644
--- a/converters/py-zfec/pkg-descr
+++ b/converters/py-zfec/pkg-descr
@@ -7,4 +7,4 @@ that if some blocks are lost then the original data can be recovered
from the remaining blocks. The zfec package includes command-line
tools, C API, Python API, and Haskell API.
-WWW: https://pypi.python.org/pypi/zfec
+WWW: https://pypi.org/project/zfec/
diff --git a/converters/zbase32/pkg-descr b/converters/zbase32/pkg-descr
index ec035e02a195..e319d298f84b 100644
--- a/converters/zbase32/pkg-descr
+++ b/converters/zbase32/pkg-descr
@@ -1,4 +1,4 @@
zbase32 is a base32 encoder/decoder. It is an alternate
base32 encoder but not RFC 3548 compliant.
-WWW: https://pypi.python.org/pypi/zbase32
+WWW: https://pypi.org/project/zbase32/
diff --git a/databases/nagios-check_postgres_replication/pkg-descr b/databases/nagios-check_postgres_replication/pkg-descr
index 99c1e969acb6..42af9aae4563 100644
--- a/databases/nagios-check_postgres_replication/pkg-descr
+++ b/databases/nagios-check_postgres_replication/pkg-descr
@@ -13,4 +13,4 @@ including:
* Default options
* Persistent "cookies" to retain state information between check runs
-WWW: https://pypi.python.org/pypi/nagiosplugin
+WWW: https://pypi.org/project/nagiosplugin/
diff --git a/databases/py-dbf/pkg-descr b/databases/py-dbf/pkg-descr
index 4988d4afd821..87bb6caffc2a 100644
--- a/databases/py-dbf/pkg-descr
+++ b/databases/py-dbf/pkg-descr
@@ -6,4 +6,4 @@ Text is returned as unicode, and codepage settings in tables are
honored. Documentation needs work, but author is very responsive
to e-mails.
-WWW: https://pypi.python.org/pypi/dbf
+WWW: https://pypi.org/project/dbf/
diff --git a/databases/py-flask-sqlalchemy/pkg-descr b/databases/py-flask-sqlalchemy/pkg-descr
index 4d818fcf2cd9..8e7a890d3c88 100644
--- a/databases/py-flask-sqlalchemy/pkg-descr
+++ b/databases/py-flask-sqlalchemy/pkg-descr
@@ -1,3 +1,3 @@
Flask-SQLAlchemy adds support for SQLAlchemy to your Flask application.
-WWW: https://pypi.python.org/pypi/Flask-SQLAlchemy
+WWW: https://pypi.org/project/Flask-SQLAlchemy/
diff --git a/databases/py-geoalchemy/pkg-descr b/databases/py-geoalchemy/pkg-descr
index b4fae515a828..9f555521bcfb 100644
--- a/databases/py-geoalchemy/pkg-descr
+++ b/databases/py-geoalchemy/pkg-descr
@@ -2,4 +2,4 @@ GeoAlchemy is an extension of SQLAlchemy. It provides support for Geospatial
data types at the ORM layer using SQLAlchemy. It aims to support spatial
operations and relations specified by the Open Geospatial Consortium (OGC).
-WWW: https://pypi.python.org/pypi/GeoAlchemy
+WWW: https://pypi.org/project/GeoAlchemy/
diff --git a/databases/py-geoalchemy2/pkg-descr b/databases/py-geoalchemy2/pkg-descr
index e70095659185..94d9d6f4c1c0 100644
--- a/databases/py-geoalchemy2/pkg-descr
+++ b/databases/py-geoalchemy2/pkg-descr
@@ -5,4 +5,4 @@ Simpler to use, and simpler to maintain.
Git repository: https://github.com/geoalchemy/geoalchemy2
-WWW: https://pypi.python.org/pypi/GeoAlchemy2
+WWW: https://pypi.org/project/GeoAlchemy2/
diff --git a/databases/py-influxdb/pkg-descr b/databases/py-influxdb/pkg-descr
index 3c2f2224db22..273b5aa07b14 100644
--- a/databases/py-influxdb/pkg-descr
+++ b/databases/py-influxdb/pkg-descr
@@ -1,3 +1,3 @@
InfluxDB-Python is a client for interacting with InfluxDB.
-WWW: https://pypi.python.org/pypi/influxdb
+WWW: https://pypi.org/project/influxdb/
diff --git a/databases/py-leveldb/pkg-descr b/databases/py-leveldb/pkg-descr
index fd6240bcec7c..6f7805822c29 100644
--- a/databases/py-leveldb/pkg-descr
+++ b/databases/py-leveldb/pkg-descr
@@ -4,5 +4,5 @@ from the LevelDB API, except for:
- Snapshots
- All iteration except for single-step forward
-WWW: https://pypi.python.org/pypi/leveldb
+WWW: https://pypi.org/project/leveldb/
WWW: https://github.com/rjpower/py-leveldb
diff --git a/databases/py-motor/pkg-descr b/databases/py-motor/pkg-descr
index b3f17ae5247b..70f520eeeae2 100644
--- a/databases/py-motor/pkg-descr
+++ b/databases/py-motor/pkg-descr
@@ -1,4 +1,4 @@
Motor presents a callback- or Future-based API for non-blocking access to
MongoDB from Tornado or asyncio.
-WWW: https://pypi.python.org/pypi/motor
+WWW: https://pypi.org/project/motor/
diff --git a/databases/py-mycli/pkg-descr b/databases/py-mycli/pkg-descr
index f3283c45802c..3608f6248ac4 100644
--- a/databases/py-mycli/pkg-descr
+++ b/databases/py-mycli/pkg-descr
@@ -1,5 +1,5 @@
mycli is a command line interface for MySQL, MariaDB, and Percona with
auto-completion and syntax highlighting.
-WWW: https://pypi.python.org/pypi/mycli
+WWW: https://pypi.org/project/mycli/
WWW: https://www.mycli.net/
diff --git a/databases/py-pgcli/pkg-descr b/databases/py-pgcli/pkg-descr
index df138365882e..68cab9c053aa 100644
--- a/databases/py-pgcli/pkg-descr
+++ b/databases/py-pgcli/pkg-descr
@@ -1,5 +1,5 @@
pgcli is a command line interface for Postgres with auto-completion and syntax
highlighting.
-WWW: https://pypi.python.org/pypi/pgcli
+WWW: https://pypi.org/project/pgcli/
WWW: https://www.pgcli.com/
diff --git a/databases/py-pgspecial/pkg-descr b/databases/py-pgspecial/pkg-descr
index 87c8c83c793f..fcef2ec78f97 100644
--- a/databases/py-pgspecial/pkg-descr
+++ b/databases/py-pgspecial/pkg-descr
@@ -1,5 +1,5 @@
This package provides an API to execute meta-commands (AKA "special", or
"backslash commands") on PostgreSQL.
-WWW: https://pypi.python.org/pypi/pgspecial
+WWW: https://pypi.org/project/pgspecial/
WWW: https://github.com/dbcli/pgspecial
diff --git a/databases/py-pickledb/pkg-descr b/databases/py-pickledb/pkg-descr
index d67dceb858ee..d6e81f9adba3 100644
--- a/databases/py-pickledb/pkg-descr
+++ b/databases/py-pickledb/pkg-descr
@@ -1,5 +1,5 @@
pickleDB is a lightweight, fast, and simple database based on Python's own
json module.
-WWW: https://pypi.python.org/pypi/pickleDB
+WWW: https://pypi.org/project/pickleDB/
WWW: https://github.com/patx/pickledb
diff --git a/databases/py-pyhs/pkg-descr b/databases/py-pyhs/pkg-descr
index a79bf1a22dd7..74b9c09adad3 100644
--- a/databases/py-pyhs/pkg-descr
+++ b/databases/py-pyhs/pkg-descr
@@ -2,4 +2,4 @@ pyhs (python-handler-socket) is a Python client library for the
HandlerSocket <https://github.com/ahiguti/HandlerSocket-Plugin-for-MySQL/>
MySQL plugin.
-WWW: https://pypi.python.org/pypi/python-handler-socket
+WWW: https://pypi.org/project/python-handler-socket/
diff --git a/databases/py-python-memcached/pkg-descr b/databases/py-python-memcached/pkg-descr
index a2cef794518c..f272286c6c9d 100644
--- a/databases/py-python-memcached/pkg-descr
+++ b/databases/py-python-memcached/pkg-descr
@@ -5,6 +5,6 @@ value automatically going in and out of the memcached.
The Python API, while tested, has not experienced real-world production use.
-WWW: https://pypi.python.org/pypi/python-memcached
+WWW: https://pypi.org/project/python-memcached/
WWW: http://www.tummy.com/software/python-memcached/
WWW: https://github.com/linsomniac/python-memcached
diff --git a/databases/py-sqlparse/pkg-descr b/databases/py-sqlparse/pkg-descr
index bf8b5643a03a..25cd23b7b837 100644
--- a/databases/py-sqlparse/pkg-descr
+++ b/databases/py-sqlparse/pkg-descr
@@ -1,5 +1,5 @@
sqlparse is a non-validating SQL parser module.
It provides support for parsing, splitting and formatting SQL statements.
-WWW: https://pypi.python.org/pypi/sqlparse
+WWW: https://pypi.org/project/sqlparse/
WWW: https://github.com/andialbrecht/sqlparse
diff --git a/databases/py-sqlparse020/pkg-descr b/databases/py-sqlparse020/pkg-descr
index c14e6918626d..0d1e0f58223f 100644
--- a/databases/py-sqlparse020/pkg-descr
+++ b/databases/py-sqlparse020/pkg-descr
@@ -3,5 +3,5 @@ It provides support for parsing, splitting and formatting SQL statements.
This is version 0.2.0 which is needed by calendarserver.
-WWW: https://pypi.python.org/pypi/sqlparse
+WWW: https://pypi.org/project/sqlparse/
WWW: https://github.com/andialbrecht/sqlparse
diff --git a/databases/py-tarantool/pkg-descr b/databases/py-tarantool/pkg-descr
index 44033c97978d..b3fa19ba5d1e 100644
--- a/databases/py-tarantool/pkg-descr
+++ b/databases/py-tarantool/pkg-descr
@@ -1,4 +1,4 @@
This package is a pure-python client library for Tarantool Database.
-WWW: https://pypi.python.org/pypi/tarantool
+WWW: https://pypi.org/project/tarantool/
WWW: https://github.com/tarantool/tarantool-python
diff --git a/databases/py-zodbpickle/pkg-descr b/databases/py-zodbpickle/pkg-descr
index 3715b553459e..c80a86222187 100644
--- a/databases/py-zodbpickle/pkg-descr
+++ b/databases/py-zodbpickle/pkg-descr
@@ -8,4 +8,4 @@ Under Py3k, this package forks the pickle module (and the supporting
C extension) from both Python 3.2 and Python 3.3. The fork add support
for the noload operations used by ZODB.
-WWW: https://pypi.python.org/pypi/zodbpickle
+WWW: https://pypi.org/project/zodbpickle/
diff --git a/deskutils/py-pystash/pkg-descr b/deskutils/py-pystash/pkg-descr
index d5840722732d..e21b04ad0860 100644
--- a/deskutils/py-pystash/pkg-descr
+++ b/deskutils/py-pystash/pkg-descr
@@ -1,4 +1,4 @@
Save your code snippets in the cloud (http://trystash.com/) from
the command line.
-WWW: https://pypi.python.org/pypi/pystash
+WWW: https://pypi.org/project/pystash/
diff --git a/devel/bbfreeze-loader/pkg-descr b/devel/bbfreeze-loader/pkg-descr
index df672058286c..99a32deadb7a 100644
--- a/devel/bbfreeze-loader/pkg-descr
+++ b/devel/bbfreeze-loader/pkg-descr
@@ -1,4 +1,4 @@
bbfreeze-loader provides binary dependencies for bbfreeze, utility to create
standalone executables from Python scripts.
-WWW: https://pypi.python.org/pypi/bbfreeze-loader
+WWW: https://pypi.org/project/bbfreeze-loader/
diff --git a/devel/bbfreeze/pkg-descr b/devel/bbfreeze/pkg-descr
index 36a5ba7196b6..99e54da38f27 100644
--- a/devel/bbfreeze/pkg-descr
+++ b/devel/bbfreeze/pkg-descr
@@ -12,4 +12,4 @@ It has the following features:
- Automatic pathname rewriting (pathnames in tracebacks are relative)
- New distutils command: bdist_bbfreeze
-WWW: https://pypi.python.org/pypi/bbfreeze
+WWW: https://pypi.org/project/bbfreeze/
diff --git a/devel/cram/pkg-descr b/devel/cram/pkg-descr
index 4390da06ceae..9484b554389e 100644
--- a/devel/cram/pkg-descr
+++ b/devel/cram/pkg-descr
@@ -2,4 +2,4 @@ Cram is a functional testing framework for command line applications. Cram
tests look like snippets of interactive shell sessions. Cram runs each command
and compares the command output in the test with the command's actual output.
-WWW: https://pypi.python.org/pypi/cram
+WWW: https://pypi.org/project/cram/
diff --git a/devel/hgsvn/pkg-descr b/devel/hgsvn/pkg-descr
index 83c34553dec4..8bc1335608a7 100644
--- a/devel/hgsvn/pkg-descr
+++ b/devel/hgsvn/pkg-descr
@@ -15,4 +15,4 @@ Three scripts are provided:
be run multiple times.
* hgpushsvn pushes your local Mercurial commits back to the SVN repository.
-WWW: https://pypi.python.org/pypi/hgsvn
+WWW: https://pypi.org/project/hgsvn/
diff --git a/devel/pep8/pkg-descr b/devel/pep8/pkg-descr
index 476b3b268c81..f53ee7afd4f5 100644
--- a/devel/pep8/pkg-descr
+++ b/devel/pep8/pkg-descr
@@ -1,4 +1,4 @@
pep8 is a tool to check your Python code against some of the style conventions
in PEP 8.
-WWW: https://pypi.python.org/pypi/pep8
+WWW: https://pypi.org/project/pep8/
diff --git a/devel/py-Acquisition/pkg-descr b/devel/py-Acquisition/pkg-descr
index 3a54b74b61d2..61d09fa37c6d 100644
--- a/devel/py-Acquisition/pkg-descr
+++ b/devel/py-Acquisition/pkg-descr
@@ -1,4 +1,4 @@
Acquisition is a mechanism that allows objects to obtain attributes from the
containment hierarchy they're in.
-WWW: https://pypi.python.org/pypi/Acquisition
+WWW: https://pypi.org/project/Acquisition/
diff --git a/devel/py-BytecodeAssembler/pkg-descr b/devel/py-BytecodeAssembler/pkg-descr
index 179751667d64..302196f8076a 100644
--- a/devel/py-BytecodeAssembler/pkg-descr
+++ b/devel/py-BytecodeAssembler/pkg-descr
@@ -4,4 +4,4 @@ tracking, line number table generation, constant and variable name index
tracking, etc. That way, you can focus your attention on the desired
semantics of your bytecode instead of on these mechanical issues.
-WWW: https://pypi.python.org/pypi/BytecodeAssembler
+WWW: https://pypi.org/project/BytecodeAssembler/
diff --git a/devel/py-DateTime/pkg-descr b/devel/py-DateTime/pkg-descr
index b573d9e52c8d..3524f6b2bd06 100644
--- a/devel/py-DateTime/pkg-descr
+++ b/devel/py-DateTime/pkg-descr
@@ -2,4 +2,4 @@ This package provides a DateTime data type, as known from Zope 2.
Unless you need to communicate with Zope 2 APIs, you're probably
better off using Python's built-in datetime module.
-WWW: https://pypi.python.org/pypi/DateTime
+WWW: https://pypi.org/project/DateTime/
diff --git a/devel/py-DocumentTemplate/pkg-descr b/devel/py-DocumentTemplate/pkg-descr
index da860ac8531b..8745d071c085 100644
--- a/devel/py-DocumentTemplate/pkg-descr
+++ b/devel/py-DocumentTemplate/pkg-descr
@@ -6,4 +6,4 @@ logic and loops.
Inside Zope environments page templates and TAL have superseded
DTML for most use cases.
-WWW: https://pypi.python.org/pypi/DocumentTemplate
+WWW: https://pypi.org/project/DocumentTemplate/
diff --git a/devel/py-ExtensionClass/pkg-descr b/devel/py-ExtensionClass/pkg-descr
index 2be222b20f21..b864b48bb9df 100644
--- a/devel/py-ExtensionClass/pkg-descr
+++ b/devel/py-ExtensionClass/pkg-descr
@@ -1,4 +1,4 @@
This package provides a metaclass that allows classes implemented
in extension modules to be subclassed in Python.
-WWW: https://pypi.python.org/pypi/ExtensionClass
+WWW: https://pypi.org/project/ExtensionClass/
diff --git a/devel/py-Faker/pkg-descr b/devel/py-Faker/pkg-descr
index 803471d79c26..422ad821ff96 100644
--- a/devel/py-Faker/pkg-descr
+++ b/devel/py-Faker/pkg-descr
@@ -6,4 +6,4 @@ data taken from a production service, Faker is for you.
Faker is heavily inspired by PHP's [Faker][php-faker], Perl's
[Data::Faker][perl-faker], and by ruby's [Faker][ruby-faker].
-WWW: https://pypi.python.org/pypi/Faker
+WWW: https://pypi.org/project/Faker/
diff --git a/devel/py-Missing/pkg-descr b/devel/py-Missing/pkg-descr
index 70cd733a9628..67ab3a80cc66 100644
--- a/devel/py-Missing/pkg-descr
+++ b/devel/py-Missing/pkg-descr
@@ -1,6 +1,6 @@
Missing provides special objects used in some Zope2 internals
like the ZCatalog.
-WWW: https://pypi.python.org/pypi/Missing
+WWW: https://pypi.org/project/Missing/
diff --git a/devel/py-MultiMapping/pkg-descr b/devel/py-MultiMapping/pkg-descr
index 828fa9a1f06c..a71e225a6402 100644
--- a/devel/py-MultiMapping/pkg-descr
+++ b/devel/py-MultiMapping/pkg-descr
@@ -1,4 +1,4 @@
MultiMapping provides special objects used in some Zope2 internals
like ZRDB.
-WWW: https://pypi.python.org/pypi/MultiMapping
+WWW: https://pypi.org/project/MultiMapping/
diff --git a/devel/py-PEAK-Rules/pkg-descr b/devel/py-PEAK-Rules/pkg-descr
index bf0d5ec4faa1..def189bd4032 100644
--- a/devel/py-PEAK-Rules/pkg-descr
+++ b/devel/py-PEAK-Rules/pkg-descr
@@ -6,4 +6,4 @@ Python expressions, and CLOS-like method combining. (But the framework
allows you to mix and match dispatch engines and custom method
combinations, if you need or want to.)
-WWW: https://pypi.python.org/pypi/PEAK-Rules
+WWW: https://pypi.org/project/PEAK-Rules/
diff --git a/devel/py-Persistence/pkg-descr b/devel/py-Persistence/pkg-descr
index 165c9e7238f2..be5c8f2eda97 100644
--- a/devel/py-Persistence/pkg-descr
+++ b/devel/py-Persistence/pkg-descr
@@ -2,4 +2,4 @@ This package provides a variant of the persistent base class that's
an ExtensionClass. Unless you need ExtensionClass semantics, you
probably want to use persistent.Persistent from ZODB3.
-WWW: https://pypi.python.org/pypi/Persistence
+WWW: https://pypi.org/project/Persistence/
diff --git a/devel/py-Pint/pkg-descr b/devel/py-Pint/pkg-descr
index ba105ab72992..30781ca50c54 100644
--- a/devel/py-Pint/pkg-descr
+++ b/devel/py-Pint/pkg-descr
@@ -8,4 +8,4 @@ constants. Due to its modular design, you can extend (or even rewrite!) the
complete list without changing the source code. It supports a lot of numpy
mathematical operations without monkey patching or wrapping numpy.
-WWW: https://pypi.python.org/pypi/Pint
+WWW: https://pypi.org/project/Pint/
diff --git a/devel/py-Products.ATContentTypes/pkg-descr b/devel/py-Products.ATContentTypes/pkg-descr
index d7be4cd005fd..10bdc85ff72a 100644
--- a/devel/py-Products.ATContentTypes/pkg-descr
+++ b/devel/py-Products.ATContentTypes/pkg-descr
@@ -1,3 +1,3 @@
Default Content Types for Plone.
-WWW: https://pypi.python.org/pypi/Products.ATContentTypes
+WWW: https://pypi.org/project/Products.ATContentTypes/
diff --git a/devel/py-Products.ATReferenceBrowserWidget/pkg-descr b/devel/py-Products.ATReferenceBrowserWidget/pkg-descr
index fa8dd42d1697..99b2d7683412 100644
--- a/devel/py-Products.ATReferenceBrowserWidget/pkg-descr
+++ b/devel/py-Products.ATReferenceBrowserWidget/pkg-descr
@@ -1,3 +1,3 @@
ATReferenceBrowserWidget is reference widget for Archetypes.
-WWW: https://pypi.python.org/pypi/Products.ATReferenceBrowserWidget
+WWW: https://pypi.org/project/Products.ATReferenceBrowserWidget/
diff --git a/devel/py-Products.Archetypes/pkg-descr b/devel/py-Products.Archetypes/pkg-descr
index 85d7bb729f9f..92b2fbf831f9 100644
--- a/devel/py-Products.Archetypes/pkg-descr
+++ b/devel/py-Products.Archetypes/pkg-descr
@@ -1,4 +1,4 @@
Archetypes is a developers framework for rapidly developing and deploying rich,
full featured content types within the context of Zope/CMF and Plone.
-WWW: https://pypi.python.org/pypi/Products.Archetypes
+WWW: https://pypi.org/project/Products.Archetypes/
diff --git a/devel/py-Products.BTreeFolder2/pkg-descr b/devel/py-Products.BTreeFolder2/pkg-descr
index cd6a0afa9b7b..bc5736aa4349 100644
--- a/devel/py-Products.BTreeFolder2/pkg-descr
+++ b/devel/py-Products.BTreeFolder2/pkg-descr
@@ -1,4 +1,4 @@
BTreeFolder2 is a Zope product that acts like a Zope2 OFS folder
but can store many more items.
-WWW: https://pypi.python.org/pypi/Products.BTreeFolder2
+WWW: https://pypi.org/project/Products.BTreeFolder2/
diff --git a/devel/py-Products.CMFActionIcons/pkg-descr b/devel/py-Products.CMFActionIcons/pkg-descr
index b3fb192a0160..0be7925b2644 100644
--- a/devel/py-Products.CMFActionIcons/pkg-descr
+++ b/devel/py-Products.CMFActionIcons/pkg-descr
@@ -1,3 +1,3 @@
Action icons product for the Zope Content Management Framework.
-WWW: https://pypi.python.org/pypi/Products.CMFActionIcons
+WWW: https://pypi.org/project/Products.CMFActionIcons/
diff --git a/devel/py-Products.CMFCalendar/pkg-descr b/devel/py-Products.CMFCalendar/pkg-descr
index 1a68b8d3d597..d5eb67d4da18 100644
--- a/devel/py-Products.CMFCalendar/pkg-descr
+++ b/devel/py-Products.CMFCalendar/pkg-descr
@@ -1,3 +1,3 @@
Calendar product for the Zope Content Management Framework.
-WWW: https://pypi.python.org/pypi/Products.CMFCalendar
+WWW: https://pypi.org/project/Products.CMFCalendar/
diff --git a/devel/py-Products.CMFCore/pkg-descr b/devel/py-Products.CMFCore/pkg-descr
index af16ec0e095c..4bc62fee4961 100644
--- a/devel/py-Products.CMFCore/pkg-descr
+++ b/devel/py-Products.CMFCore/pkg-descr
@@ -1,3 +1,3 @@
Zope Content Management Framework core components.
-WWW: https://pypi.python.org/pypi/Products.CMFCore
+WWW: https://pypi.org/project/Products.CMFCore/
diff --git a/devel/py-Products.CMFDefault/pkg-descr b/devel/py-Products.CMFDefault/pkg-descr
index 1ff2434aaabe..fcb69581c7e9 100644
--- a/devel/py-Products.CMFDefault/pkg-descr
+++ b/devel/py-Products.CMFDefault/pkg-descr
@@ -1,3 +1,3 @@
Default product for the Zope Content Management Framework.
-WWW: https://pypi.python.org/pypi/Products.CMFDefault
+WWW: https://pypi.org/project/Products.CMFDefault/
diff --git a/devel/py-Products.CMFDiffTool/pkg-descr b/devel/py-Products.CMFDiffTool/pkg-descr
index 2579c40ddce6..456040d96cce 100644
--- a/devel/py-Products.CMFDiffTool/pkg-descr
+++ b/devel/py-Products.CMFDiffTool/pkg-descr
@@ -1,3 +1,3 @@
Diff tool for Plone.
-WWW: https://pypi.python.org/pypi/Products.CMFDiffTool
+WWW: https://pypi.org/project/Products.CMFDiffTool/
diff --git a/devel/py-Products.CMFDynamicViewFTI/pkg-descr b/devel/py-Products.CMFDynamicViewFTI/pkg-descr
index abbedd136cec..98825060825e 100644
--- a/devel/py-Products.CMFDynamicViewFTI/pkg-descr
+++ b/devel/py-Products.CMFDynamicViewFTI/pkg-descr
@@ -1,3 +1,3 @@
CMFDynamicViewFTI is a product for dynamic views in CMF.
-WWW: https://pypi.python.org/pypi/Products.CMFDynamicViewFTI
+WWW: https://pypi.org/project/Products.CMFDynamicViewFTI/
diff --git a/devel/py-Products.CMFEditions/pkg-descr b/devel/py-Products.CMFEditions/pkg-descr
index f176876e56f5..16187a46bd18 100644
--- a/devel/py-Products.CMFEditions/pkg-descr
+++ b/devel/py-Products.CMFEditions/pkg-descr
@@ -1,3 +1,3 @@
Versioning for Plone.
-WWW: https://pypi.python.org/pypi/Products.CMFEditions
+WWW: https://pypi.org/project/Products.CMFEditions/
diff --git a/devel/py-Products.CMFFormController/pkg-descr b/devel/py-Products.CMFFormController/pkg-descr
index 90fb69c55150..06deda076fd2 100644
--- a/devel/py-Products.CMFFormController/pkg-descr
+++ b/devel/py-Products.CMFFormController/pkg-descr
@@ -1,3 +1,3 @@
CMFFormController provides a form validation mechanism for CMF.
-WWW: https://pypi.python.org/pypi/Products.CMFFormController
+WWW: https://pypi.org/project/Products.CMFFormController/
diff --git a/devel/py-Products.CMFPlacefulWorkflow/pkg-descr b/devel/py-Products.CMFPlacefulWorkflow/pkg-descr
index 15a096877b97..68ddf116dd37 100644
--- a/devel/py-Products.CMFPlacefulWorkflow/pkg-descr
+++ b/devel/py-Products.CMFPlacefulWorkflow/pkg-descr
@@ -1,3 +1,3 @@
Workflow policies for CMF and Plone.
-WWW: https://pypi.python.org/pypi/Products.CMFPlacefulWorkflow
+WWW: https://pypi.org/project/Products.CMFPlacefulWorkflow/
diff --git a/devel/py-Products.CMFQuickInstallerTool/pkg-descr b/devel/py-Products.CMFQuickInstallerTool/pkg-descr
index 4979f82b8a0d..d2cc50352ad9 100644
--- a/devel/py-Products.CMFQuickInstallerTool/pkg-descr
+++ b/devel/py-Products.CMFQuickInstallerTool/pkg-descr
@@ -1,4 +1,4 @@
CMFQuickInstallerTool is a facility for comfortable activation/deactivation
of CMF compliant products
-WWW: https://pypi.python.org/pypi/Products.CMFQuickInstallerTools
+WWW: https://pypi.org/project/Products.CMFQuickInstallerTool/
diff --git a/devel/py-Products.CMFUid/pkg-descr b/devel/py-Products.CMFUid/pkg-descr
index 1b43074d7d86..c46f34ccb282 100644
--- a/devel/py-Products.CMFUid/pkg-descr
+++ b/devel/py-Products.CMFUid/pkg-descr
@@ -1,3 +1,3 @@
Uid product for the Zope Content Management Framework.
-WWW: https://pypi.python.org/pypi/Products.CMFUid
+WWW: https://pypi.org/project/Products.CMFUid/
diff --git a/devel/py-Products.DCWorkflow/pkg-descr b/devel/py-Products.DCWorkflow/pkg-descr
index 645877f78a68..97a437c88c6a 100644
--- a/devel/py-Products.DCWorkflow/pkg-descr
+++ b/devel/py-Products.DCWorkflow/pkg-descr
@@ -1,3 +1,3 @@
DCWorkflow product for the Zope Content Management Framework.
-WWW: https://pypi.python.org/pypi/Products.DCWorkflow
+WWW: https://pypi.org/project/Products.DCWorkflow/
diff --git a/devel/py-Products.ExtendedPathIndex/pkg-descr b/devel/py-Products.ExtendedPathIndex/pkg-descr
index 6e84b12c008e..872eae4d46c7 100644
--- a/devel/py-Products.ExtendedPathIndex/pkg-descr
+++ b/devel/py-Products.ExtendedPathIndex/pkg-descr
@@ -1,3 +1,3 @@
Zope catalog index for paths.
-WWW: https://pypi.python.org/pypi/Products.ExtendedPathIndex
+WWW: https://pypi.org/project/Products.ExtendedPathIndex/
diff --git a/devel/py-Products.ExternalEditor/pkg-descr b/devel/py-Products.ExternalEditor/pkg-descr
index 44ab49e6d6ec..f793abe8e084 100644
--- a/devel/py-Products.ExternalEditor/pkg-descr
+++ b/devel/py-Products.ExternalEditor/pkg-descr
@@ -1,3 +1,3 @@
Zope External Editor.
-WWW: https://pypi.python.org/pypi/Products.ExternalEditor
+WWW: https://pypi.org/project/Products.ExternalEditor/
diff --git a/devel/py-Products.ExternalMethod/pkg-descr b/devel/py-Products.ExternalMethod/pkg-descr
index c8ae62d5e425..d6d26b6be9ff 100644
--- a/devel/py-Products.ExternalMethod/pkg-descr
+++ b/devel/py-Products.ExternalMethod/pkg-descr
@@ -1,4 +1,4 @@
This package provides support for external Python methods
within a Zope 2 environment.
-WWW: https://pypi.python.org/pypi/Products.ExternalMethod
+WWW: https://pypi.org/project/Products.ExternalMethod/
diff --git a/devel/py-Products.GenericSetup/pkg-descr b/devel/py-Products.GenericSetup/pkg-descr
index 6367220b00d9..3fc3cd1e0550 100644
--- a/devel/py-Products.GenericSetup/pkg-descr
+++ b/devel/py-Products.GenericSetup/pkg-descr
@@ -1,3 +1,3 @@
Read Zope configuration state from profile dirs / tarballs.
-WWW: https://pypi.python.org/pypi/Products.GenericSetup
+WWW: https://pypi.org/project/Products.GenericSetup/
diff --git a/devel/py-Products.LDAPMultiPlugins/pkg-descr b/devel/py-Products.LDAPMultiPlugins/pkg-descr
index 87ccd453f897..fceec359247a 100644
--- a/devel/py-Products.LDAPMultiPlugins/pkg-descr
+++ b/devel/py-Products.LDAPMultiPlugins/pkg-descr
@@ -1,3 +1,3 @@
LDAP-backed plugins for the Zope2 PluggableAuthService
-WWW: https://pypi.python.org/pypi/Products.LDAPMultiPlugins
+WWW: https://pypi.org/project/Products.LDAPMultiPlugins/
diff --git a/devel/py-Products.LDAPUserFolder/pkg-descr b/devel/py-Products.LDAPUserFolder/pkg-descr
index 37561fcc80c7..528842265be6 100644
--- a/devel/py-Products.LDAPUserFolder/pkg-descr
+++ b/devel/py-Products.LDAPUserFolder/pkg-descr
@@ -1,3 +1,3 @@
A LDAP-enabled Zope 2 user folder
-WWW: https://pypi.python.org/pypi/Products.LDAPUserFolder
+WWW: https://pypi.org/project/Products.LDAPUserFolder/
diff --git a/devel/py-Products.MIMETools/pkg-descr b/devel/py-Products.MIMETools/pkg-descr
index 9bdf140e3d1d..6ebbcc67f8ae 100644
--- a/devel/py-Products.MIMETools/pkg-descr
+++ b/devel/py-Products.MIMETools/pkg-descr
@@ -1,3 +1,3 @@
MIMETools provides the <!--#mime--> tag for DocumentTemplate.
-WWW: https://pypi.python.org/pypi/Products.MIMETools
+WWW: https://pypi.org/project/Products.MIMETools/
diff --git a/devel/py-Products.Marshall/pkg-descr b/devel/py-Products.Marshall/pkg-descr
index 6446cc12bd00..1c92e6ad1e14 100644
--- a/devel/py-Products.Marshall/pkg-descr
+++ b/devel/py-Products.Marshall/pkg-descr
@@ -1,3 +1,3 @@
Configurable Marshallers for Archetypes.
-WWW: https://pypi.python.org/pypi/Products.Marshall
+WWW: https://pypi.org/project/Products.Marshall/
diff --git a/devel/py-Products.MimetypesRegistry/pkg-descr b/devel/py-Products.MimetypesRegistry/pkg-descr
index 3ae6333e9c84..2c88b1dabb9f 100644
--- a/devel/py-Products.MimetypesRegistry/pkg-descr
+++ b/devel/py-Products.MimetypesRegistry/pkg-descr
@@ -1,3 +1,3 @@
MIME type handling for Zope.
-WWW: https://pypi.python.org/pypi/Products.MimetypesRegistry
+WWW: https://pypi.org/project/Products.MimetypesRegistry/
diff --git a/devel/py-Products.OFSP/pkg-descr b/devel/py-Products.OFSP/pkg-descr
index bc916ec37fca..d05664544589 100644
--- a/devel/py-Products.OFSP/pkg-descr
+++ b/devel/py-Products.OFSP/pkg-descr
@@ -1,3 +1,3 @@
OFSP provides the general Zope 2 help.
-WWW: https://pypi.python.org/pypi/Products.OFSP
+WWW: https://pypi.org/project/Products.OFSP/
diff --git a/devel/py-Products.PasswordResetTool/pkg-descr b/devel/py-Products.PasswordResetTool/pkg-descr
index 3228426f5bcd..4b6d8570fdfa 100644
--- a/devel/py-Products.PasswordResetTool/pkg-descr
+++ b/devel/py-Products.PasswordResetTool/pkg-descr
@@ -1,3 +1,3 @@
Password reset tool for Plone.
-WWW: https://pypi.python.org/pypi/Products.PasswordResetTool
+WWW: https://pypi.org/project/Products.PasswordResetTool/
diff --git a/devel/py-Products.PlacelessTranslationService/pkg-descr b/devel/py-Products.PlacelessTranslationService/pkg-descr
index 64c2be38db44..858127663278 100644
--- a/devel/py-Products.PlacelessTranslationService/pkg-descr
+++ b/devel/py-Products.PlacelessTranslationService/pkg-descr
@@ -1,4 +1,4 @@
PTS provides a way of internationalizing (i18n'ing) and localizing (l10n'ing)
software for Zope 2.
-WWW: https://pypi.python.org/pypi/Products.PlacelessTranslationService
+WWW: https://pypi.org/project/Products.PlacelessTranslationService/
diff --git a/devel/py-Products.PloneLanguageTool/pkg-descr b/devel/py-Products.PloneLanguageTool/pkg-descr
index bda990d38d9d..7d489ed21226 100644
--- a/devel/py-Products.PloneLanguageTool/pkg-descr
+++ b/devel/py-Products.PloneLanguageTool/pkg-descr
@@ -2,4 +2,4 @@ PloneLanguageTool allows you to set the available languages in your Plone site,
select various fallback mechanisms, and control the use of flags for language
selection and translations.
-WWW: https://pypi.python.org/pypi/Products.PloneLanguageTool
+WWW: https://pypi.org/project/Products.PloneLanguageTool/
diff --git a/devel/py-Products.PluginRegistry/pkg-descr b/devel/py-Products.PluginRegistry/pkg-descr
index 33e8403e8765..a4fb24831057 100644
--- a/devel/py-Products.PluginRegistry/pkg-descr
+++ b/devel/py-Products.PluginRegistry/pkg-descr
@@ -1,3 +1,3 @@
Configure application plugins based on interfaces.
-WWW: https://pypi.python.org/pypi/Products.PluginRegistry
+WWW: https://pypi.org/project/Products.PluginRegistry/
diff --git a/devel/py-Products.PortalTransforms/pkg-descr b/devel/py-Products.PortalTransforms/pkg-descr
index 59ffe8e60b93..38f5a4cb4ea3 100644
--- a/devel/py-Products.PortalTransforms/pkg-descr
+++ b/devel/py-Products.PortalTransforms/pkg-descr
@@ -1,3 +1,3 @@
MIME based content transformations.
-WWW: https://pypi.python.org/pypi/Products.PortalTransforms
+WWW: https://pypi.org/project/Products.PortalTransforms/
diff --git a/devel/py-Products.PythonScripts/pkg-descr b/devel/py-Products.PythonScripts/pkg-descr
index 47e5d70a5a33..f849a11377f7 100644
--- a/devel/py-Products.PythonScripts/pkg-descr
+++ b/devel/py-Products.PythonScripts/pkg-descr
@@ -2,4 +2,4 @@ The Python Scripts product provides support for restricted execution
of Python scripts, exposing them as callable objects within the Zope
environment.
-WWW: https://pypi.python.org/pypi/Products.PythonScripts
+WWW: https://pypi.org/project/Products.PythonScripts/
diff --git a/devel/py-Products.ResourceRegistries/pkg-descr b/devel/py-Products.ResourceRegistries/pkg-descr
index 672e8bdc89c0..14bc0d179cdc 100644
--- a/devel/py-Products.ResourceRegistries/pkg-descr
+++ b/devel/py-Products.ResourceRegistries/pkg-descr
@@ -1,3 +1,3 @@
Registry for managing CSS and JS.
-WWW: https://pypi.python.org/pypi/Products.ResourceRegistries
+WWW: https://pypi.org/project/Products.ResourceRegistries/
diff --git a/devel/py-Products.StandardCacheManagers/pkg-descr b/devel/py-Products.StandardCacheManagers/pkg-descr
index 341681fd83e1..95c940f35793 100644
--- a/devel/py-Products.StandardCacheManagers/pkg-descr
+++ b/devel/py-Products.StandardCacheManagers/pkg-descr
@@ -2,4 +2,4 @@ This package provides two cache managers for Zope 2. A RAMCacheManager
and an Accelerated HTTP cache manager, which adds HTTP cache headers
to responses.
-WWW: https://pypi.python.org/pypi/Products.StandardCacheManagers
+WWW: https://pypi.org/project/Products.StandardCacheManagers/
diff --git a/devel/py-Products.ZCTextIndex/pkg-descr b/devel/py-Products.ZCTextIndex/pkg-descr
index b0cac2d684cd..1157658fcaf5 100644
--- a/devel/py-Products.ZCTextIndex/pkg-descr
+++ b/devel/py-Products.ZCTextIndex/pkg-descr
@@ -1,4 +1,4 @@
This package contains a full text indexing facility for Zope2 and
more specifically for Products.ZCatalog.
-WWW: https://pypi.python.org/pypi/Products.ZCTextIndex
+WWW: https://pypi.org/project/Products.ZCTextIndex/
diff --git a/devel/py-Products.ZCatalog/pkg-descr b/devel/py-Products.ZCatalog/pkg-descr
index 371b3a1a9b78..712e826b4c2c 100644
--- a/devel/py-Products.ZCatalog/pkg-descr
+++ b/devel/py-Products.ZCatalog/pkg-descr
@@ -2,4 +2,4 @@ The ZCatalog is Zope2's built in search engine. It allows you to
categorize and search all kinds of Zope objects. It comes with a
variety of indexes for different types of data.
-WWW: https://pypi.python.org/pypi/Products.ZCatalog
+WWW: https://pypi.org/project/Products.ZCatalog/
diff --git a/devel/py-Products.ZSQLMethods/pkg-descr b/devel/py-Products.ZSQLMethods/pkg-descr
index 99b9ea85e1d6..6112265c3895 100644
--- a/devel/py-Products.ZSQLMethods/pkg-descr
+++ b/devel/py-Products.ZSQLMethods/pkg-descr
@@ -1,3 +1,3 @@
SQL method support for Zope 2.
-WWW: https://pypi.python.org/pypi/Products.ZSQLMethods
+WWW: https://pypi.org/project/Products.ZSQLMethods/
diff --git a/devel/py-Products.ZopeVersionControl/pkg-descr b/devel/py-Products.ZopeVersionControl/pkg-descr
index 72e547d3b2a9..e897df1f1b64 100644
--- a/devel/py-Products.ZopeVersionControl/pkg-descr
+++ b/devel/py-Products.ZopeVersionControl/pkg-descr
@@ -1,3 +1,3 @@
Zope Version Control.
-WWW: https://pypi.python.org/pypi/Products.ZopeVersionControl
+WWW: https://pypi.org/project/Products.ZopeVersionControl/
diff --git a/devel/py-Products.contentmigration/pkg-descr b/devel/py-Products.contentmigration/pkg-descr
index 6a3e77fa21fa..c79a212094ac 100644
--- a/devel/py-Products.contentmigration/pkg-descr
+++ b/devel/py-Products.contentmigration/pkg-descr
@@ -1,3 +1,3 @@
A generic content migration framework for Plone.
-WWW: https://pypi.python.org/pypi/Products.contentmigration
+WWW: https://pypi.org/project/Products.contentmigration/
diff --git a/devel/py-Products.statusmessages/pkg-descr b/devel/py-Products.statusmessages/pkg-descr
index be0769bdd0cc..aab74f6126df 100644
--- a/devel/py-Products.statusmessages/pkg-descr
+++ b/devel/py-Products.statusmessages/pkg-descr
@@ -2,4 +2,4 @@ statusmessages provides an easy way of handling internationalized status
messages managed via an BrowserRequest adapter storing status messages in
client-side cookies.
-WWW: https://pypi.python.org/pypi/Products.statusmessages
+WWW: https://pypi.org/project/Products.statusmessages/
diff --git a/devel/py-Products.validation/pkg-descr b/devel/py-Products.validation/pkg-descr
index 8518c0d16969..19db02e852b4 100644
--- a/devel/py-Products.validation/pkg-descr
+++ b/devel/py-Products.validation/pkg-descr
@@ -1,3 +1,3 @@
Data validation package for Archetypes.
-WWW: https://pypi.python.org/pypi/Products.validation
+WWW: https://pypi.org/project/Products.validation/
diff --git a/devel/py-PyExecJS/pkg-descr b/devel/py-PyExecJS/pkg-descr
index 99622272bd6a..4ae49c8e69b0 100644
--- a/devel/py-PyExecJS/pkg-descr
+++ b/devel/py-PyExecJS/pkg-descr
@@ -11,4 +11,4 @@ Supported runtimes
* PhantomJS
* Nashorn - Included with Oracle Java 8
-WWW: https://pypi.python.org/pypi/PyExecJS
+WWW: https://pypi.org/project/PyExecJS/
diff --git a/devel/py-Record/pkg-descr b/devel/py-Record/pkg-descr
index 9be198910607..5a6a7386bda9 100644
--- a/devel/py-Record/pkg-descr
+++ b/devel/py-Record/pkg-descr
@@ -1,3 +1,3 @@
Record provides special objects used in some Zope2 internals like ZRDB.
-WWW: https://pypi.python.org/pypi/Record
+WWW: https://pypi.org/project/Record/
diff --git a/devel/py-XStatic-Angular-Bootstrap/pkg-descr b/devel/py-XStatic-Angular-Bootstrap/pkg-descr
index d87e68a3cf6a..2ef6a87d2f7b 100644
--- a/devel/py-XStatic-Angular-Bootstrap/pkg-descr
+++ b/devel/py-XStatic-Angular-Bootstrap/pkg-descr
@@ -4,4 +4,4 @@ that provides a Bootstrap widgets for Angular framework.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-Angular-Bootstrap
+WWW: https://pypi.org/project/XStatic-Angular-Bootstrap/
diff --git a/devel/py-XStatic-Angular-FileUpload/pkg-descr b/devel/py-XStatic-Angular-FileUpload/pkg-descr
index 9100d304325a..e29d7dd10987 100644
--- a/devel/py-XStatic-Angular-FileUpload/pkg-descr
+++ b/devel/py-XStatic-Angular-FileUpload/pkg-descr
@@ -4,4 +4,4 @@ that provides a Angular File Upload support for the AngularJS framework.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-Angular-FileUpload
+WWW: https://pypi.org/project/XStatic-Angular-FileUpload/
diff --git a/devel/py-XStatic-Angular-Gettext/pkg-descr b/devel/py-XStatic-Angular-Gettext/pkg-descr
index b99f2666a5de..91bbf408ecc0 100644
--- a/devel/py-XStatic-Angular-Gettext/pkg-descr
+++ b/devel/py-XStatic-Angular-Gettext/pkg-descr
@@ -4,4 +4,4 @@ that provides a Gettext support for Angular.js.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-Angular-Gettext
+WWW: https://pypi.org/project/XStatic-Angular-Gettext/
diff --git a/devel/py-XStatic-Angular-Schema-Form/pkg-descr b/devel/py-XStatic-Angular-Schema-Form/pkg-descr
index cccb087c60ab..409dc4eb67fc 100644
--- a/devel/py-XStatic-Angular-Schema-Form/pkg-descr
+++ b/devel/py-XStatic-Angular-Schema-Form/pkg-descr
@@ -4,4 +4,4 @@ library that provides a complex forms from a JSON schema with Angular.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-Angular-Schema-Form
+WWW: https://pypi.org/project/XStatic-Angular-Schema-Form/
diff --git a/devel/py-XStatic-Angular-lrdragndrop/pkg-descr b/devel/py-XStatic-Angular-lrdragndrop/pkg-descr
index 8243bf033abe..5cd303cb91fa 100644
--- a/devel/py-XStatic-Angular-lrdragndrop/pkg-descr
+++ b/devel/py-XStatic-Angular-lrdragndrop/pkg-descr
@@ -4,4 +4,4 @@ that provides a HTML5 Drag and Drop AngularJS module.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-Angular-lrdragndrop
+WWW: https://pypi.org/project/XStatic-Angular-lrdragndrop/
diff --git a/devel/py-XStatic-Angular/pkg-descr b/devel/py-XStatic-Angular/pkg-descr
index d2e9e076bce3..3100f5bbb68c 100644
--- a/devel/py-XStatic-Angular/pkg-descr
+++ b/devel/py-XStatic-Angular/pkg-descr
@@ -4,4 +4,4 @@ that provides a JavaScript MVW Framework.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-Angular
+WWW: https://pypi.org/project/XStatic-Angular/
diff --git a/devel/py-XStatic-Bootstrap-Datepicker/pkg-descr b/devel/py-XStatic-Bootstrap-Datepicker/pkg-descr
index 180240735943..6fc5c25838d6 100644
--- a/devel/py-XStatic-Bootstrap-Datepicker/pkg-descr
+++ b/devel/py-XStatic-Bootstrap-Datepicker/pkg-descr
@@ -4,4 +4,4 @@ that provides a datepicker for Bootstrap.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-Bootstrap-Datepicker
+WWW: https://pypi.org/project/XStatic-Bootstrap-Datepicker/
diff --git a/devel/py-XStatic-Bootstrap-SCSS/pkg-descr b/devel/py-XStatic-Bootstrap-SCSS/pkg-descr
index 5b48583862dc..219218874ee3 100644
--- a/devel/py-XStatic-Bootstrap-SCSS/pkg-descr
+++ b/devel/py-XStatic-Bootstrap-SCSS/pkg-descr
@@ -4,4 +4,4 @@ that provides a Bootstrap SCSS stylesheets.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-Bootstrap-SCSS
+WWW: https://pypi.org/project/XStatic-Bootstrap-SCSS/
diff --git a/devel/py-XStatic-D3/pkg-descr b/devel/py-XStatic-D3/pkg-descr
index bfa344054d0d..072a86069d63 100644
--- a/devel/py-XStatic-D3/pkg-descr
+++ b/devel/py-XStatic-D3/pkg-descr
@@ -4,4 +4,4 @@ that provides a Data-Driven Documents framework.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-D3
+WWW: https://pypi.org/project/XStatic-D3/
diff --git a/devel/py-XStatic-Font-Awesome/pkg-descr b/devel/py-XStatic-Font-Awesome/pkg-descr
index a021148fa10e..a7f39fffa4ec 100644
--- a/devel/py-XStatic-Font-Awesome/pkg-descr
+++ b/devel/py-XStatic-Font-Awesome/pkg-descr
@@ -4,4 +4,4 @@ that provides the iconic font and CSS framework.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-Font-Awesome
+WWW: https://pypi.org/project/XStatic-Font-Awesome/
diff --git a/devel/py-XStatic-Hogan/pkg-descr b/devel/py-XStatic-Hogan/pkg-descr
index 1eb5e3cd1821..3e0332ccb311 100644
--- a/devel/py-XStatic-Hogan/pkg-descr
+++ b/devel/py-XStatic-Hogan/pkg-descr
@@ -4,4 +4,4 @@ that provides a JavaScript templating framework.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-Hogan
+WWW: https://pypi.org/project/XStatic-Hogan/
diff --git a/devel/py-XStatic-JQuery-Migrate/pkg-descr b/devel/py-XStatic-JQuery-Migrate/pkg-descr
index 14da3a11f44f..6d950b9eadb8 100644
--- a/devel/py-XStatic-JQuery-Migrate/pkg-descr
+++ b/devel/py-XStatic-JQuery-Migrate/pkg-descr
@@ -4,4 +4,4 @@ that provides a JQuery migration kit.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-JQuery-Migrate
+WWW: https://pypi.org/project/XStatic-JQuery-Migrate/
diff --git a/devel/py-XStatic-JQuery.TableSorter/pkg-descr b/devel/py-XStatic-JQuery.TableSorter/pkg-descr
index 2592c204a50a..5c57ff8904dd 100644
--- a/devel/py-XStatic-JQuery.TableSorter/pkg-descr
+++ b/devel/py-XStatic-JQuery.TableSorter/pkg-descr
@@ -4,4 +4,4 @@ that provides a lightweight jQuery plugin for creating sortable tables.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-JQuery.TableSorter
+WWW: https://pypi.org/project/XStatic-JQuery.TableSorter/
diff --git a/devel/py-XStatic-JQuery.quicksearch/pkg-descr b/devel/py-XStatic-JQuery.quicksearch/pkg-descr
index 2776bbf5435f..a53695155664 100644
--- a/devel/py-XStatic-JQuery.quicksearch/pkg-descr
+++ b/devel/py-XStatic-JQuery.quicksearch/pkg-descr
@@ -4,4 +4,4 @@ that provides a JQuery plugin for searching through tables.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-JQuery.quicksearch
+WWW: https://pypi.org/project/XStatic-JQuery.quicksearch/
diff --git a/devel/py-XStatic-JSEncrypt/pkg-descr b/devel/py-XStatic-JSEncrypt/pkg-descr
index 5ec573a6260f..0b1c99df8088 100644
--- a/devel/py-XStatic-JSEncrypt/pkg-descr
+++ b/devel/py-XStatic-JSEncrypt/pkg-descr
@@ -4,4 +4,4 @@ that provides a Javascript library to perform OpenSSL RSA.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-JSEncrypt
+WWW: https://pypi.org/project/XStatic-JSEncrypt/
diff --git a/devel/py-XStatic-Jasmine/pkg-descr b/devel/py-XStatic-Jasmine/pkg-descr
index 7312483a168f..bd25773b7831 100644
--- a/devel/py-XStatic-Jasmine/pkg-descr
+++ b/devel/py-XStatic-Jasmine/pkg-descr
@@ -4,4 +4,4 @@ that provides a DOM-less simple JavaScript testing framework.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-Jasmine
+WWW: https://pypi.org/project/XStatic-Jasmine/
diff --git a/devel/py-XStatic-Rickshaw/pkg-descr b/devel/py-XStatic-Rickshaw/pkg-descr
index 461379092068..d74c93574543 100644
--- a/devel/py-XStatic-Rickshaw/pkg-descr
+++ b/devel/py-XStatic-Rickshaw/pkg-descr
@@ -4,4 +4,4 @@ that provides a JavaScript toolkit for interactive time series graphs.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-Rickshaw
+WWW: https://pypi.org/project/XStatic-Rickshaw/
diff --git a/devel/py-XStatic-Spin/pkg-descr b/devel/py-XStatic-Spin/pkg-descr
index ec5c7f5073e4..8ece97d21877 100644
--- a/devel/py-XStatic-Spin/pkg-descr
+++ b/devel/py-XStatic-Spin/pkg-descr
@@ -4,4 +4,4 @@ that provides a Spinner component.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-Spin
+WWW: https://pypi.org/project/XStatic-Spin/
diff --git a/devel/py-XStatic-bootswatch/pkg-descr b/devel/py-XStatic-bootswatch/pkg-descr
index 8840654b3b9a..f9739d830c56 100644
--- a/devel/py-XStatic-bootswatch/pkg-descr
+++ b/devel/py-XStatic-bootswatch/pkg-descr
@@ -4,4 +4,4 @@ that provides a Bootswatch collection of themes for Bootstrap.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-bootswatch
+WWW: https://pypi.org/project/XStatic-bootswatch/
diff --git a/devel/py-XStatic-jQuery/pkg-descr b/devel/py-XStatic-jQuery/pkg-descr
index 0103ab014287..33c81d30fa5a 100644
--- a/devel/py-XStatic-jQuery/pkg-descr
+++ b/devel/py-XStatic-jQuery/pkg-descr
@@ -4,4 +4,4 @@ that provides a JavaScript library for DOM operations.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-jQuery
+WWW: https://pypi.org/project/XStatic-jQuery/
diff --git a/devel/py-XStatic-jquery-ui/pkg-descr b/devel/py-XStatic-jquery-ui/pkg-descr
index 8d4d9734608b..f0bd2e250c7a 100644
--- a/devel/py-XStatic-jquery-ui/pkg-descr
+++ b/devel/py-XStatic-jquery-ui/pkg-descr
@@ -4,4 +4,4 @@ that provides a JQuery library for building user interfaces.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-jquery-ui
+WWW: https://pypi.org/project/XStatic-jquery-ui/
diff --git a/devel/py-XStatic-mdi/pkg-descr b/devel/py-XStatic-mdi/pkg-descr
index d954c65e5f14..31839f402317 100644
--- a/devel/py-XStatic-mdi/pkg-descr
+++ b/devel/py-XStatic-mdi/pkg-descr
@@ -4,4 +4,4 @@ that provides a Material Design Webfont.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-mdi
+WWW: https://pypi.org/project/XStatic-mdi/
diff --git a/devel/py-XStatic-objectpath/pkg-descr b/devel/py-XStatic-objectpath/pkg-descr
index ea7705633961..23bb31cffc63 100644
--- a/devel/py-XStatic-objectpath/pkg-descr
+++ b/devel/py-XStatic-objectpath/pkg-descr
@@ -4,4 +4,4 @@ that provides a Parser for js object paths.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-objectpath
+WWW: https://pypi.org/project/XStatic-objectpath/
diff --git a/devel/py-XStatic-roboto-fontface/pkg-descr b/devel/py-XStatic-roboto-fontface/pkg-descr
index 18f179bdeb51..c2352f286959 100644
--- a/devel/py-XStatic-roboto-fontface/pkg-descr
+++ b/devel/py-XStatic-roboto-fontface/pkg-descr
@@ -4,4 +4,4 @@ that provides a Simple package providing the Roboto fontface.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-roboto-fontface
+WWW: https://pypi.org/project/XStatic-roboto-fontface/
diff --git a/devel/py-XStatic-smart-table/pkg-descr b/devel/py-XStatic-smart-table/pkg-descr
index b922ca9a6ae7..591dd75c3cad 100644
--- a/devel/py-XStatic-smart-table/pkg-descr
+++ b/devel/py-XStatic-smart-table/pkg-descr
@@ -4,4 +4,4 @@ that provides a table module for angular js.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-smart-table
+WWW: https://pypi.org/project/XStatic-smart-table/
diff --git a/devel/py-XStatic-term.js/pkg-descr b/devel/py-XStatic-term.js/pkg-descr
index a6a750fef846..d3503c2a9687 100644
--- a/devel/py-XStatic-term.js/pkg-descr
+++ b/devel/py-XStatic-term.js/pkg-descr
@@ -4,4 +4,4 @@ that provides a terminal written in javascript
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-term.js
+WWW: https://pypi.org/project/XStatic-term.js/
diff --git a/devel/py-XStatic-tv4/pkg-descr b/devel/py-XStatic-tv4/pkg-descr
index e7dc47dd3e0b..42493165d855 100644
--- a/devel/py-XStatic-tv4/pkg-descr
+++ b/devel/py-XStatic-tv4/pkg-descr
@@ -4,4 +4,4 @@ that provides a JSON Schema validator for JavaScript.
It uses the XStatic packaging standard, aimed to bring an ability to
install javascript libraries via easy_install or pip utility.
-WWW: https://pypi.python.org/pypi/XStatic-tv4
+WWW: https://pypi.org/project/XStatic-tv4/
diff --git a/devel/py-XStatic/pkg-descr b/devel/py-XStatic/pkg-descr
index dbcc8718a983..ddfb13e72a1c 100644
--- a/devel/py-XStatic/pkg-descr
+++ b/devel/py-XStatic/pkg-descr
@@ -1,4 +1,4 @@
The goal of XStatic family of packages is to provide static file packages with
minimal overhead - without selling you some dependencies you dont want.
-WWW: https://pypi.python.org/pypi/XStatic
+WWW: https://pypi.org/project/XStatic/
diff --git a/devel/py-ZopeUndo/pkg-descr b/devel/py-ZopeUndo/pkg-descr
index bb032b08ca1d..4e13e5390a28 100644
--- a/devel/py-ZopeUndo/pkg-descr
+++ b/devel/py-ZopeUndo/pkg-descr
@@ -2,4 +2,4 @@ This package is used to support the Prefix object that Zope 2
uses for the undo log. It is a separate package only to aid
configuration management.
-WWW: https://pypi.python.org/pypi/ZopeUndo
+WWW: https://pypi.org/project/ZopeUndo/
diff --git a/devel/py-anyconfig/pkg-descr b/devel/py-anyconfig/pkg-descr
index 8daf9e1b5ab0..5a1e7ef805a0 100644
--- a/devel/py-anyconfig/pkg-descr
+++ b/devel/py-anyconfig/pkg-descr
@@ -1,4 +1,4 @@
Generic access to configuration files in many formats
with configuration merge / cascade / overlay support
-WWW: https://pypi.python.org/pypi/anyconfig
+WWW: https://pypi.org/project/anyconfig/
diff --git a/devel/py-application/pkg-descr b/devel/py-application/pkg-descr
index 3540296968fe..8d79f0852b1f 100644
--- a/devel/py-application/pkg-descr
+++ b/devel/py-application/pkg-descr
@@ -1,3 +1,3 @@
Basic building blocks for python applications
-WWW: https://pypi.python.org/pypi/python-application
+WWW: https://pypi.org/project/python-application/
diff --git a/devel/py-apscheduler/pkg-descr b/devel/py-apscheduler/pkg-descr
index a07419a2314a..a9960bf72793 100644
--- a/devel/py-apscheduler/pkg-descr
+++ b/devel/py-apscheduler/pkg-descr
@@ -6,4 +6,4 @@ survive scheduler restarts and maintain their state. When the
scheduler is restarted, it will then run all the jobs it should have
run while it was offline.
-WWW: https://pypi.python.org/pypi/APScheduler
+WWW: https://pypi.org/project/APScheduler/
diff --git a/devel/py-archetypes.querywidget/pkg-descr b/devel/py-archetypes.querywidget/pkg-descr
index 9908694314c0..989e596316bf 100644
--- a/devel/py-archetypes.querywidget/pkg-descr
+++ b/devel/py-archetypes.querywidget/pkg-descr
@@ -1,4 +1,4 @@
Archetypes.querywidget implements a widget for creating catalog queries using an
email-filtering-like interface, as found in GMail or Apple Mail.
-WWW: https://pypi.python.org/pypi/archetypes.querywidget
+WWW: https://pypi.org/project/archetypes.querywidget/
diff --git a/devel/py-archetypes.referencebrowserwidget/pkg-descr b/devel/py-archetypes.referencebrowserwidget/pkg-descr
index d24581629bd6..2aec5eeec7ca 100644
--- a/devel/py-archetypes.referencebrowserwidget/pkg-descr
+++ b/devel/py-archetypes.referencebrowserwidget/pkg-descr
@@ -1,3 +1,3 @@
A referencebrowser implementation for Archetypes.
-WWW: https://pypi.python.org/pypi/archetypes.referencebrowserwidget
+WWW: https://pypi.org/project/archetypes.referencebrowserwidget/
diff --git a/devel/py-archetypes.schemaextender/pkg-descr b/devel/py-archetypes.schemaextender/pkg-descr
index b200cfe69339..c7441d5705db 100644
--- a/devel/py-archetypes.schemaextender/pkg-descr
+++ b/devel/py-archetypes.schemaextender/pkg-descr
@@ -1,3 +1,3 @@
Dynamically extend Archetypes schemas with named adapters.
-WWW: https://pypi.python.org/pypi/archetypes.schemaextender
+WWW: https://pypi.org/project/archetypes.schemaextender/
diff --git a/devel/py-argcomplete/pkg-descr b/devel/py-argcomplete/pkg-descr
index 49f2fd4dc2a6..5dc7bd71b37d 100644
--- a/devel/py-argcomplete/pkg-descr
+++ b/devel/py-argcomplete/pkg-descr
@@ -11,5 +11,5 @@ subparsers, and if your program can dynamically suggest completions for your
argument/option values (for example, if the user is browsing resources over the
network).
-WWW: https://pypi.python.org/pypi/argcomplete
+WWW: https://pypi.org/project/argcomplete/
WWW: https://github.com/kislyuk/argcomplete
diff --git a/devel/py-astor/pkg-descr b/devel/py-astor/pkg-descr
index c140cb1e41a2..48d53a41656b 100644
--- a/devel/py-astor/pkg-descr
+++ b/devel/py-astor/pkg-descr
@@ -2,4 +2,4 @@ Read/rewrite/write Python ASTs
astor is designed to allow easy manipulation of Python source via the AST.
-WWW: https://pypi.python.org/pypi/astor
+WWW: https://pypi.org/project/astor/
diff --git a/devel/py-astroid/pkg-descr b/devel/py-astroid/pkg-descr
index e1b6629f6237..040528a6f7ea 100644
--- a/devel/py-astroid/pkg-descr
+++ b/devel/py-astroid/pkg-descr
@@ -10,5 +10,5 @@ methods and attributes for different usages. They include some support for
static inference and local name scopes. Furthermore, astroid builds partial
trees by inspecting living objects.
-WWW: https://pypi.python.org/pypi/astroid
+WWW: https://pypi.org/project/astroid/
WWW: https://github.com/PyCQA/astroid
diff --git a/devel/py-asttokens/pkg-descr b/devel/py-asttokens/pkg-descr
index 329f7ad3b136..8ae1c115cb04 100644
--- a/devel/py-asttokens/pkg-descr
+++ b/devel/py-asttokens/pkg-descr
@@ -6,4 +6,4 @@ It makes it possible for tools that work with logical AST nodes to
find the particular text that resulted in those nodes, for example
for automated refactoring or highlighting.
-WWW: https://pypi.python.org/pypi/asttokens
+WWW: https://pypi.org/project/asttokens/
diff --git a/devel/py-async_generator/pkg-descr b/devel/py-async_generator/pkg-descr
index 04a686a3a1f5..746b1184c3b7 100644
--- a/devel/py-async_generator/pkg-descr
+++ b/devel/py-async_generator/pkg-descr
@@ -1,3 +1,3 @@
This is a tiny library to add async generators†to Python 3.5.
-WWW: https://pypi.org/project/async_generator
+WWW: https://pypi.org/project/async_generator/
diff --git a/devel/py-atomiclong/pkg-descr b/devel/py-atomiclong/pkg-descr
index f99823b97735..646ba4fe0128 100644
--- a/devel/py-atomiclong/pkg-descr
+++ b/devel/py-atomiclong/pkg-descr
@@ -1,4 +1,4 @@
AtomicLong was born out of the need for fast thread-safe counters in Python.
Its value is a C long which can be incremented, decremented, and set atomically.
-WWW: https://pypi.python.org/pypi/atomiclong
+WWW: https://pypi.org/project/atomiclong/
diff --git a/devel/py-automaton/pkg-descr b/devel/py-automaton/pkg-descr
index 65ab84e57591..8b41f6f3930a 100644
--- a/devel/py-automaton/pkg-descr
+++ b/devel/py-automaton/pkg-descr
@@ -5,4 +5,4 @@ pattern and has a multitude of various usages. Some of the usages for this
library include providing state & transition validation and
running/scheduling/analyzing the execution of tasks.
-WWW: https://pypi.python.org/pypi/automaton
+WWW: https://pypi.org/project/automaton/
diff --git a/devel/py-avro/pkg-descr b/devel/py-avro/pkg-descr
index 9b641637284b..cb7fc5a5598c 100644
--- a/devel/py-avro/pkg-descr
+++ b/devel/py-avro/pkg-descr
@@ -10,5 +10,5 @@ Apache Avro is a data serialization system which provides:
generation as an optional optimization, only worth implementing for statically
typed languages.
-WWW: https://pypi.python.org/pypi/avro
+WWW: https://pypi.org/project/avro/
WWW: https://avro.apache.org/
diff --git a/devel/py-backports.csv/pkg-descr b/devel/py-backports.csv/pkg-descr
index 389966fe0761..4b28cf682844 100644
--- a/devel/py-backports.csv/pkg-descr
+++ b/devel/py-backports.csv/pkg-descr
@@ -5,5 +5,5 @@ str in Python 2 and Python 3.
The semantics of Python 3's version are more useful because they support unicode
natively, while Python 2's csv does not.
-WWW: https://pypi.python.org/pypi/backports.csv
+WWW: https://pypi.org/project/backports.csv/
WWW: https://github.com/ryanhiebert/backports.csv
diff --git a/devel/py-backports.functools_lru_cache/pkg-descr b/devel/py-backports.functools_lru_cache/pkg-descr
index 89167cf75cd1..f086a226dff6 100644
--- a/devel/py-backports.functools_lru_cache/pkg-descr
+++ b/devel/py-backports.functools_lru_cache/pkg-descr
@@ -1,5 +1,5 @@
backports.functools_lru_cache is a backport of functools.lru_cache from Python
3.3 as published at ActiveState.
-WWW: https://pypi.python.org/pypi/backports.functools_lru_cache
+WWW: https://pypi.org/project/backports.functools_lru_cache/
WWW: https://github.com/jaraco/backports.functools_lru_cache
diff --git a/devel/py-bitarray/pkg-descr b/devel/py-bitarray/pkg-descr
index bb6bdc9d0810..d83bdb7afb19 100644
--- a/devel/py-bitarray/pkg-descr
+++ b/devel/py-bitarray/pkg-descr
@@ -8,4 +8,4 @@ files is required, such as portable bitmap image files (.pbm). Also, when
dealing with compressed data which uses variable bit length encoding, you may
find this module useful.
-WWW: https://pypi.python.org/pypi/bitarray
+WWW: https://pypi.org/project/bitarray/
diff --git a/devel/py-bitstring/pkg-descr b/devel/py-bitstring/pkg-descr
index 6c0333d5566d..7b7eb47a7089 100644
--- a/devel/py-bitstring/pkg-descr
+++ b/devel/py-bitstring/pkg-descr
@@ -8,4 +8,4 @@ read from, searched and replaced, and navigated in, similar to a file or stream.
bitstring is open source software, and has been released under the MIT licence.
-WWW: https://pypi.python.org/pypi/bitstring
+WWW: https://pypi.org/project/bitstring/
diff --git a/devel/py-castellan/pkg-descr b/devel/py-castellan/pkg-descr
index 33b49d6e97a1..eb2fa89b5583 100644
--- a/devel/py-castellan/pkg-descr
+++ b/devel/py-castellan/pkg-descr
@@ -1,3 +1,3 @@
Generic Key Manager interface for OpenStack.
-WWW: https://pypi.python.org/pypi/castellan
+WWW: https://pypi.org/project/castellan/
diff --git a/devel/py-celery/pkg-descr b/devel/py-celery/pkg-descr
index b731fb2d3921..0cbb42ba9be5 100644
--- a/devel/py-celery/pkg-descr
+++ b/devel/py-celery/pkg-descr
@@ -14,4 +14,4 @@ The recommended message broker is RabbitMQ, but limited support for Redis,
Beanstalk, MongoDB, CouchDB, and databases (using SQLAlchemy or the Django
ORM) is also available.
-WWW: https://pypi.python.org/pypi/celery
+WWW: https://pypi.org/project/celery/
diff --git a/devel/py-check-manifest/pkg-descr b/devel/py-check-manifest/pkg-descr
index 0fe9a86348a6..038287ebdb5c 100644
--- a/devel/py-check-manifest/pkg-descr
+++ b/devel/py-check-manifest/pkg-descr
@@ -2,5 +2,5 @@ Are you a Python developer? Have you uploaded packages to the Python Package
Index? Have you accidentally uploaded broken packages with some files missing?
If so, check-manifest is for you.
-WWW: https://pypi.python.org/pypi/check-manifest
+WWW: https://pypi.org/project/check-manifest/
WWW: https://github.com/mgedmin/check-manifest
diff --git a/devel/py-cli-helpers/pkg-descr b/devel/py-cli-helpers/pkg-descr
index efc95ad72937..07480cc8c6e3 100644
--- a/devel/py-cli-helpers/pkg-descr
+++ b/devel/py-cli-helpers/pkg-descr
@@ -13,5 +13,5 @@ What’s included in CLI Helpers?
- Prettyprinting of tabular data with custom pre-processing
- [in progress] config file reading/writing
-WWW: https://pypi.python.org/pypi/cli-helpers
+WWW: https://pypi.org/project/cli-helpers/
WWW: https://github.com/dbcli/cli_helpers
diff --git a/devel/py-click-plugins/pkg-descr b/devel/py-click-plugins/pkg-descr
index dc91d33de958..78b95d5f550c 100644
--- a/devel/py-click-plugins/pkg-descr
+++ b/devel/py-click-plugins/pkg-descr
@@ -1,4 +1,4 @@
An extension module for click to enable registering CLI commands via setuptools
entry-points.
-WWW: https://pypi.python.org/pypi/click-plugins
+WWW: https://pypi.org/project/click-plugins/
diff --git a/devel/py-cliff/pkg-descr b/devel/py-cliff/pkg-descr
index 053fc4507dac..bd7e4ef58d4b 100644
--- a/devel/py-cliff/pkg-descr
+++ b/devel/py-cliff/pkg-descr
@@ -2,4 +2,4 @@ cliff is a framework for building command line programs.
It uses setuptools entry points to provide subcommands, output formatters,
and other extensions.
-WWW: https://pypi.python.org/pypi/cliff
+WWW: https://pypi.org/project/cliff/
diff --git a/devel/py-cluster/pkg-descr b/devel/py-cluster/pkg-descr
index 23c22aa27b2f..9ce270a7f2dc 100644
--- a/devel/py-cluster/pkg-descr
+++ b/devel/py-cluster/pkg-descr
@@ -6,4 +6,4 @@ that calculates the similarity between two of those objects.
For simple datatypes, like integers, this can be as simple as a
subtraction, but more complex calculations are possible.
-WWW: https://pypi.python.org/pypi/cluster
+WWW: https://pypi.org/project/cluster/
diff --git a/devel/py-cmd2/pkg-descr b/devel/py-cmd2/pkg-descr
index 61ffbbec2943..f74601394b77 100644
--- a/devel/py-cmd2/pkg-descr
+++ b/devel/py-cmd2/pkg-descr
@@ -1,3 +1,3 @@
Extra features for standard library cmd module.
-WWW: https://pypi.python.org/pypi/cmd2
+WWW: https://pypi.org/project/cmd2/
diff --git a/devel/py-collective.monkeypatcher/pkg-descr b/devel/py-collective.monkeypatcher/pkg-descr
index 81370dbaa855..f65ea50c1cfc 100644
--- a/devel/py-collective.monkeypatcher/pkg-descr
+++ b/devel/py-collective.monkeypatcher/pkg-descr
@@ -1,4 +1,4 @@
Support for applying monkey patches late in the startup cycle by using ZCML
configuration actions.
-WWW: https://pypi.python.org/pypi/collective.monkeypatcher
+WWW: https://pypi.org/project/collective.monkeypatcher/
diff --git a/devel/py-collective.z3cform.datetimewidget/pkg-descr b/devel/py-collective.z3cform.datetimewidget/pkg-descr
index 0613e221ac9d..39718fd51a90 100644
--- a/devel/py-collective.z3cform.datetimewidget/pkg-descr
+++ b/devel/py-collective.z3cform.datetimewidget/pkg-descr
@@ -1,3 +1,3 @@
z3c.form date and datetime widgets.
-WWW: https://pypi.python.org/pypi/collective.z3cform.datetimewidget
+WWW: https://pypi.org/project/collective.z3cform.datetimewidget/
diff --git a/devel/py-colorama/pkg-descr b/devel/py-colorama/pkg-descr
index 357dcc3a0102..1046039f6ac4 100644
--- a/devel/py-colorama/pkg-descr
+++ b/devel/py-colorama/pkg-descr
@@ -7,4 +7,4 @@ Windows, too. It also provides some shortcuts to help generate ANSI sequences,
and works fine in conjunction with any other ANSI sequence generation library,
such as Termcolor.
-WWW: https://pypi.python.org/pypi/colorama
+WWW: https://pypi.org/project/colorama/
diff --git a/devel/py-colorlog/pkg-descr b/devel/py-colorlog/pkg-descr
index 23d2e64ec674..ddd7fd97ecac 100644
--- a/devel/py-colorlog/pkg-descr
+++ b/devel/py-colorlog/pkg-descr
@@ -3,4 +3,4 @@ when paired with a StreamHandler that is outputting to a terminal. This is
accomplished by added a set of terminal color codes to the record before it
is used to format the string. Convenient for logging with colors support.
-WWW: https://pypi.python.org/pypi/colorlog
+WWW: https://pypi.org/project/colorlog/
diff --git a/devel/py-conditional/pkg-descr b/devel/py-conditional/pkg-descr
index 95b6590dbd53..2ceb38dce039 100644
--- a/devel/py-conditional/pkg-descr
+++ b/devel/py-conditional/pkg-descr
@@ -1,4 +1,4 @@
The conditional context manager comes handy when you always want to execute a
with-block but only conditionally want to apply its context manager.
-WWW: https://pypi.python.org/pypi/conditional
+WWW: https://pypi.org/project/conditional/
diff --git a/devel/py-configargparse/pkg-descr b/devel/py-configargparse/pkg-descr
index eb97e191a04b..271c20d428a8 100644
--- a/devel/py-configargparse/pkg-descr
+++ b/devel/py-configargparse/pkg-descr
@@ -1,5 +1,5 @@
ConfigArgParse is a drop-in replacement for argparse that allows options to
also be set via config files and/or environment variables.
-WWW: https://pypi.python.org/pypi/ConfigArgParse
+WWW: https://pypi.org/project/ConfigArgParse/
WWW: https://github.com/bw2/ConfigArgParse
diff --git a/devel/py-configparser/pkg-descr b/devel/py-configparser/pkg-descr
index 1450b72f6ec5..0ecb744bcc46 100644
--- a/devel/py-configparser/pkg-descr
+++ b/devel/py-configparser/pkg-descr
@@ -2,4 +2,4 @@ The ancient ConfigParser module available in the standard library 2.x has
seen a major update in Python 3.2. This is a backport of those changes so
that they can be used directly in Python 2.6 - 3.5.
-WWW: https://pypi.python.org/pypi/configparser
+WWW: https://pypi.org/project/configparser/
diff --git a/devel/py-confusable_homoglyphs/pkg-descr b/devel/py-confusable_homoglyphs/pkg-descr
index 1b510c4f8b50..25cce1c51743 100644
--- a/devel/py-confusable_homoglyphs/pkg-descr
+++ b/devel/py-confusable_homoglyphs/pkg-descr
@@ -3,5 +3,5 @@ that appear identical or very similar homoglyph. Unicode homoglyphs can be a
nuisance on the web. confusable_homoglyphs helps to detect confusable usage of
unicode homoglyphs and prevent homograph attacks.
-WWW: https://pypi.python.org/pypi/confusable_homoglyphs
+WWW: https://pypi.org/project/confusable_homoglyphs/
WWW: https://github.com/vhf/confusable_homoglyphs
diff --git a/devel/py-constantly/pkg-descr b/devel/py-constantly/pkg-descr
index 0eae1478037b..79e7afcb47f7 100644
--- a/devel/py-constantly/pkg-descr
+++ b/devel/py-constantly/pkg-descr
@@ -2,4 +2,4 @@ A library that provides symbolic constant support. It includes collections
and constants with text, numeric, and bit flag values. Originally
twisted.python.constants from the Twisted project.
-WWW: https://pypi.python.org/pypi/constantly
+WWW: https://pypi.org/project/constantly/
diff --git a/devel/py-contextlib2/pkg-descr b/devel/py-contextlib2/pkg-descr
index 47d267ee7d52..33c87b0e354c 100644
--- a/devel/py-contextlib2/pkg-descr
+++ b/devel/py-contextlib2/pkg-descr
@@ -1,3 +1,3 @@
Backport of the standard library's contextlib module to earlier Python versions.
-WWW:https://pypi.python.org/pypi/contextlib2
+WWW:https://pypi.org/project/contextlib2/
diff --git a/devel/py-country/pkg-descr b/devel/py-country/pkg-descr
index 76fe95ed844a..6e98fd3853b1 100644
--- a/devel/py-country/pkg-descr
+++ b/devel/py-country/pkg-descr
@@ -9,4 +9,4 @@ The package includes a copy from Debian's pkg-isocodes and makes
the data accessible through a Python API. Translation files for
the various strings are included as well.
-WWW: https://pypi.python.org/pypi/pycountry
+WWW: https://pypi.org/project/pycountry/
diff --git a/devel/py-cursive/pkg-descr b/devel/py-cursive/pkg-descr
index 3f89bb66f1fe..4edd454f1a47 100644
--- a/devel/py-cursive/pkg-descr
+++ b/devel/py-cursive/pkg-descr
@@ -3,4 +3,4 @@ cursive project contains code extracted from various OpenStack projects for
verifying digital signatures. Additional capabilities will be added to this
project in support of various security features.
-WWW: https://pypi.python.org/pypi/cursive
+WWW: https://pypi.org/project/cursive/
diff --git a/devel/py-curtsies/pkg-descr b/devel/py-curtsies/pkg-descr
index f6fd8fc28675..24384989bb2b 100644
--- a/devel/py-curtsies/pkg-descr
+++ b/devel/py-curtsies/pkg-descr
@@ -1,4 +1,4 @@
Curtsies is a curses-like terminal wrapper, with colored strings.
-WWW: https://pypi.python.org/pypi/curtsies
+WWW: https://pypi.org/project/curtsies/
WWW: https://github.com/bpython/curtsies
diff --git a/devel/py-cycler/pkg-descr b/devel/py-cycler/pkg-descr
index 01c82dcdf0a2..7ae2ae0249a6 100644
--- a/devel/py-cycler/pkg-descr
+++ b/devel/py-cycler/pkg-descr
@@ -1,4 +1,4 @@
Composable style cycles.
WWW: https://github.com/matplotlib/cycler/
-WWW: https://pypi.python.org/pypi/Cycler
+WWW: https://pypi.org/project/Cycler/
diff --git a/devel/py-daemon-runner/pkg-descr b/devel/py-daemon-runner/pkg-descr
index 959e795aa817..f602fe6062ee 100644
--- a/devel/py-daemon-runner/pkg-descr
+++ b/devel/py-daemon-runner/pkg-descr
@@ -20,4 +20,4 @@ Customisation of the steps to become a daemon is available by setting options
on the DaemonContext instance; see the documentation for that class for each
option.
-WWW: https://pypi.python.org/pypi/daemon-runner
+WWW: https://pypi.org/project/daemon-runner/
diff --git a/devel/py-daemon/pkg-descr b/devel/py-daemon/pkg-descr
index f44fa07874b6..825a6801d543 100644
--- a/devel/py-daemon/pkg-descr
+++ b/devel/py-daemon/pkg-descr
@@ -8,4 +8,4 @@ steps are much the same for every daemon program. A DaemonContext instance holds
the behaviour and configured process environment for the program; use the
instance as a context manager to enter a daemon state.
-WWW: https://pypi.python.org/pypi/python-daemon
+WWW: https://pypi.org/project/python-daemon/
diff --git a/devel/py-daemons/pkg-descr b/devel/py-daemons/pkg-descr
index c75792d3337e..117d0aa4126b 100644
--- a/devel/py-daemons/pkg-descr
+++ b/devel/py-daemons/pkg-descr
@@ -2,4 +2,4 @@ Daemons is a resource library for Python developers that want to create daemon
processes. The idea is to provide the basic daemon functionality while still
giving the developer the ability to customize their daemon for any purpose.
-WWW: https://pypi.python.org/pypi/daemons
+WWW: https://pypi.org/project/daemons/
diff --git a/devel/py-darcsver/pkg-descr b/devel/py-darcsver/pkg-descr
index a3c59f3058db..33b92c2c51b6 100644
--- a/devel/py-darcsver/pkg-descr
+++ b/devel/py-darcsver/pkg-descr
@@ -1,4 +1,4 @@
py-darcsver is a python module to generate a version
number from darcs history.
-WWW: https://pypi.python.org/pypi/darcsver
+WWW: https://pypi.org/project/darcsver/
diff --git a/devel/py-darts.util.lru/pkg-descr b/devel/py-darts.util.lru/pkg-descr
index 7ee80a51868f..3b62e756726d 100644
--- a/devel/py-darts.util.lru/pkg-descr
+++ b/devel/py-darts.util.lru/pkg-descr
@@ -5,4 +5,4 @@ modified at run-time via the capacity property:
>>> cache.capacity
1
-WWW: https://pypi.python.org/pypi/darts.util.lru
+WWW: https://pypi.org/project/darts.util.lru/
diff --git a/devel/py-dateutils/pkg-descr b/devel/py-dateutils/pkg-descr
index ec6d7133d101..602b66e9c8ad 100644
--- a/devel/py-dateutils/pkg-descr
+++ b/devel/py-dateutils/pkg-descr
@@ -1,3 +1,3 @@
Various utilities for working with date and datetime objects
-WWW: https://pypi.python.org/pypi/dateutils
+WWW: https://pypi.org/project/dateutils/
diff --git a/devel/py-decoratortools/pkg-descr b/devel/py-decoratortools/pkg-descr
index 1c59c5522b4f..79bad60af218 100644
--- a/devel/py-decoratortools/pkg-descr
+++ b/devel/py-decoratortools/pkg-descr
@@ -6,4 +6,4 @@ How about synchronized methods?
"DecoratorTools" gets you all of this and more.
-WWW: https://pypi.python.org/pypi/DecoratorTools
+WWW: https://pypi.org/project/DecoratorTools/
diff --git a/devel/py-deprecation/pkg-descr b/devel/py-deprecation/pkg-descr
index 6c9dc4ca81aa..ef555dc19a05 100644
--- a/devel/py-deprecation/pkg-descr
+++ b/devel/py-deprecation/pkg-descr
@@ -11,5 +11,5 @@ automation of several things:
to entirely remove the code, which causes @fail_if_not_removed to raise an
AssertionError, causing either your unittest or py.test tests to fail.
-WWW: https://pypi.python.org/pypi/deprecation
+WWW: https://pypi.org/project/deprecation/
WWW: https://github.com/briancurtin/deprecation
diff --git a/devel/py-diazo/pkg-descr b/devel/py-diazo/pkg-descr
index 7b1e9bfad780..bc0f4bf9b3fc 100644
--- a/devel/py-diazo/pkg-descr
+++ b/devel/py-diazo/pkg-descr
@@ -4,4 +4,4 @@ simple transform on each request thereafter. Alternatively, compile your theme
during development, check it into Subversion, and not touch Diazo during
deployment.
-WWW: https://pypi.python.org/pypi/diazo
+WWW: https://pypi.org/project/diazo/
diff --git a/devel/py-dill/pkg-descr b/devel/py-dill/pkg-descr
index 8dc7db203d26..bc33374c25f3 100644
--- a/devel/py-dill/pkg-descr
+++ b/devel/py-dill/pkg-descr
@@ -3,4 +3,4 @@ python objects to the majority of the built-in python types. Serialization
is the process of converting an object to a byte stream, and the inverse
of which is converting a byte stream back to on python object hierarchy.
-WWW: https://pypi.python.org/pypi/dill
+WWW: https://pypi.org/project/dill/
diff --git a/devel/py-dis3/pkg-descr b/devel/py-dis3/pkg-descr
index b3c93b398ea2..b9e2c8c5e5e6 100644
--- a/devel/py-dis3/pkg-descr
+++ b/devel/py-dis3/pkg-descr
@@ -1,4 +1,4 @@
dis3 is a Python 2.7 backport of the dis module from Python 3.5.
-WWW: https://pypi.python.org/pypi/dis3
+WWW: https://pypi.org/project/dis3/
WWW: https://github.com/KeyWeeUsr/python-dis3
diff --git a/devel/py-editdistance/pkg-descr b/devel/py-editdistance/pkg-descr
index a7d2fd2fbd45..b5850d2010d1 100644
--- a/devel/py-editdistance/pkg-descr
+++ b/devel/py-editdistance/pkg-descr
@@ -1,4 +1,4 @@
This library simply implements Levenshtein distance with C++ and Cython.
-WWW: https://pypi.python.org/pypi/editdistance
+WWW: https://pypi.org/project/editdistance/
WWW: https://github.com/aflc/editdistance
diff --git a/devel/py-eggtestinfo/pkg-descr b/devel/py-eggtestinfo/pkg-descr
index b62a95ea82d1..97af8280f8f9 100644
--- a/devel/py-eggtestinfo/pkg-descr
+++ b/devel/py-eggtestinfo/pkg-descr
@@ -2,4 +2,4 @@ This package is a setuptools plugin: it adds a file to the generated .egg-info
directory, capturing the information used by the setup.py test command when
running tests.
-WWW: https://pypi.python.org/pypi/eggtestinfo
+WWW: https://pypi.org/project/eggtestinfo/
diff --git a/devel/py-ejson/pkg-descr b/devel/py-ejson/pkg-descr
index 49ad93303aa0..691a2686bb62 100644
--- a/devel/py-ejson/pkg-descr
+++ b/devel/py-ejson/pkg-descr
@@ -1,4 +1,4 @@
ejson provides an API to extend the json library to make it easy to register new
serializers and new deserializers.
-WWW: https://pypi.python.org/pypi/ejson
+WWW: https://pypi.org/project/ejson/
diff --git a/devel/py-enum-compat/pkg-descr b/devel/py-enum-compat/pkg-descr
index ce789e880fa5..6b0f355f0d74 100644
--- a/devel/py-enum-compat/pkg-descr
+++ b/devel/py-enum-compat/pkg-descr
@@ -2,4 +2,4 @@ This is a virtual package, its whole purpose is to install enum34
on Python older than 3.4.
On Python 3.4+ it’s a no-op.
-WWW: https://pypi.python.org/pypi/enum-compat
+WWW: https://pypi.org/project/enum-compat/
diff --git a/devel/py-enum34/pkg-descr b/devel/py-enum34/pkg-descr
index 14d6afe41ce5..bd49c029b892 100644
--- a/devel/py-enum34/pkg-descr
+++ b/devel/py-enum34/pkg-descr
@@ -2,4 +2,4 @@ An enumeration is a set of symbolic names (members) bound to unique, constant
values. Within an enumeration, the members can be compared by identity, and
the enumeration itself can be iterated over.
-WWW: https://pypi.python.org/pypi/enum34
+WWW: https://pypi.org/project/enum34/
diff --git a/devel/py-epsilon/pkg-descr b/devel/py-epsilon/pkg-descr
index 59daf5528a6d..4f604c3a8dd4 100644
--- a/devel/py-epsilon/pkg-descr
+++ b/devel/py-epsilon/pkg-descr
@@ -12,5 +12,5 @@ Currently included:
- A featureful Version class.
- A formal system for application of monkey-patches.
-WWW: https://pypi.python.org/pypi/Epsilon
+WWW: https://pypi.org/project/Epsilon/
WWW: https://github.com/twisted/epsilon
diff --git a/devel/py-evdev/pkg-descr b/devel/py-evdev/pkg-descr
index deb1fbe469c2..816b9d558452 100644
--- a/devel/py-evdev/pkg-descr
+++ b/devel/py-evdev/pkg-descr
@@ -7,4 +7,4 @@ This package also comes with bindings to uinput, the userspace input
subsystem. Uinput allows userspace programs to create and handle input
devices that can inject events directly into the input subsystem.
-WWW: https://pypi.python.org/pypi/evdev
+WWW: https://pypi.org/project/evdev/
diff --git a/devel/py-eventlib/pkg-descr b/devel/py-eventlib/pkg-descr
index 2b1a1f3e49c4..541e157bc9a6 100644
--- a/devel/py-eventlib/pkg-descr
+++ b/devel/py-eventlib/pkg-descr
@@ -7,4 +7,4 @@ built upon the following values:
- The library must be extensible
- 100% of test coverage is enough
-WWW: https://pypi.python.org/pypi/eventlib
+WWW: https://pypi.org/project/eventlib/
diff --git a/devel/py-extras/pkg-descr b/devel/py-extras/pkg-descr
index cb3098cf93f0..aced05891c1a 100644
--- a/devel/py-extras/pkg-descr
+++ b/devel/py-extras/pkg-descr
@@ -2,4 +2,4 @@ extras is a set of extensions to the Python standard library, originally written
to make the code within testtools cleaner, but now split out for general use
outside of a testing context.
-WWW: https://pypi.python.org/pypi/extras
+WWW: https://pypi.org/project/extras/
diff --git a/devel/py-extremes/pkg-descr b/devel/py-extremes/pkg-descr
index eb5952906136..74b45a31500b 100644
--- a/devel/py-extremes/pkg-descr
+++ b/devel/py-extremes/pkg-descr
@@ -1,4 +1,4 @@
The peak.util.extremes module provides a production-quality implementation
of the Min and Max objects from PEP 326.
-WWW: https://pypi.python.org/pypi/Extremes
+WWW: https://pypi.org/project/Extremes/
diff --git a/devel/py-ezpyinline/pkg-descr b/devel/py-ezpyinline/pkg-descr
index c1da66457850..4de6fad54793 100644
--- a/devel/py-ezpyinline/pkg-descr
+++ b/devel/py-ezpyinline/pkg-descr
@@ -6,4 +6,4 @@ from Python.
ezpyinline is forked from PyInline (http://pyinline.sourceforge.net/)
but aim to be as easy as possible and do all the magics for you.
-WWW: https://pypi.python.org/pypi/ezpyinline
+WWW: https://pypi.org/project/ezpyinline/
diff --git a/devel/py-fastimport/pkg-descr b/devel/py-fastimport/pkg-descr
index e6c2c60e1f6b..e7ac9a9c1ec4 100644
--- a/devel/py-fastimport/pkg-descr
+++ b/devel/py-fastimport/pkg-descr
@@ -1,3 +1,3 @@
This package provides a parser for and generator of the Git fastimport format.
-WWW: https://pypi.python.org/pypi/fastimport
+WWW: https://pypi.org/project/fastimport/
diff --git a/devel/py-first/pkg-descr b/devel/py-first/pkg-descr
index 95df989b8989..ed069389e4fd 100644
--- a/devel/py-first/pkg-descr
+++ b/devel/py-first/pkg-descr
@@ -3,5 +3,5 @@ first true value from an iterable, or None if there is none. If you need more
power, you can also supply a key function that is used to judge the truth value
of the element or a default value if None doesn’t fit your use case.
-WWW: https://pypi.python.org/pypi/first
+WWW: https://pypi.org/project/first/
WWW: https://github.com/hynek/first
diff --git a/devel/py-five.customerize/pkg-descr b/devel/py-five.customerize/pkg-descr
index aa6aecfe9fd8..68a515fdd757 100644
--- a/devel/py-five.customerize/pkg-descr
+++ b/devel/py-five.customerize/pkg-descr
@@ -1,3 +1,3 @@
TTW customization of template-based Zope views.
-WWW: https://pypi.python.org/pypi/five.customerize
+WWW: https://pypi.org/project/five.customerize/
diff --git a/devel/py-five.formlib/pkg-descr b/devel/py-five.formlib/pkg-descr
index 0fce52245c68..938f020c9c7f 100644
--- a/devel/py-five.formlib/pkg-descr
+++ b/devel/py-five.formlib/pkg-descr
@@ -1,3 +1,3 @@
zope.formlib integration for Zope 2.
-WWW: https://pypi.python.org/pypi/five.formlib
+WWW: https://pypi.org/project/five.formlib/
diff --git a/devel/py-five.globalrequest/pkg-descr b/devel/py-five.globalrequest/pkg-descr
index a20a83d7630e..c4489adf7c2b 100644
--- a/devel/py-five.globalrequest/pkg-descr
+++ b/devel/py-five.globalrequest/pkg-descr
@@ -1,3 +1,3 @@
Zope 2 integration for zope.globalrequest.
-WWW: https://pypi.python.org/pypi/five.globalrequest
+WWW: https://pypi.org/project/five.globalrequest/
diff --git a/devel/py-five.localsitemanager/pkg-descr b/devel/py-five.localsitemanager/pkg-descr
index 1dcd3618e496..1c4463078934 100644
--- a/devel/py-five.localsitemanager/pkg-descr
+++ b/devel/py-five.localsitemanager/pkg-descr
@@ -1,3 +1,3 @@
Local site manager implementation for Zope 2.
-WWW: https://pypi.python.org/pypi/five.localsitemanager
+WWW: https://pypi.org/project/five.localsitemanager/
diff --git a/devel/py-fixtures/pkg-descr b/devel/py-fixtures/pkg-descr
index b12e2faf6ec1..b0f788fcf1cd 100644
--- a/devel/py-fixtures/pkg-descr
+++ b/devel/py-fixtures/pkg-descr
@@ -4,5 +4,5 @@ your own fixtures using the fixtures contract. Glue code is provided that makes
using fixtures that meet the Fixtures contract in unittest compatible test cases
easy and straight forward.
-WWW: https://pypi.python.org/pypi/fixtures
+WWW: https://pypi.org/project/fixtures/
WWW: https://github.com/testing-cabal/fixtures
diff --git a/devel/py-flake8-builtins/pkg-descr b/devel/py-flake8-builtins/pkg-descr
index b646d79fe455..f3ecdaedcab1 100644
--- a/devel/py-flake8-builtins/pkg-descr
+++ b/devel/py-flake8-builtins/pkg-descr
@@ -1,3 +1,3 @@
Check for python builtins being used as variables or parameters
-WWW: https://pypi.python.org/pypi/flake8-builtins
+WWW: https://pypi.org/project/flake8-builtins/
diff --git a/devel/py-flake8-docstrings/pkg-descr b/devel/py-flake8-docstrings/pkg-descr
index 0fd95472437e..af7885168ead 100644
--- a/devel/py-flake8-docstrings/pkg-descr
+++ b/devel/py-flake8-docstrings/pkg-descr
@@ -1,3 +1,3 @@
Extension for flake8 which uses pydocstyle to check docstrings
-WWW: https://pypi.python.org/pypi/flake8-docstrings
+WWW: https://pypi.org/project/flake8-docstrings/
diff --git a/devel/py-flake8-import-order/pkg-descr b/devel/py-flake8-import-order/pkg-descr
index 5a088aef929e..98e8859f1891 100644
--- a/devel/py-flake8-import-order/pkg-descr
+++ b/devel/py-flake8-import-order/pkg-descr
@@ -1,3 +1,3 @@
Flake8 and pylama plugin that checks the ordering of import statements
-WWW: https://pypi.python.org/pypi/flake8-import-order
+WWW: https://pypi.org/project/flake8-import-order/
diff --git a/devel/py-flake8-polyfill/pkg-descr b/devel/py-flake8-polyfill/pkg-descr
index 3677b17b1fda..487cfe9ac5af 100644
--- a/devel/py-flake8-polyfill/pkg-descr
+++ b/devel/py-flake8-polyfill/pkg-descr
@@ -2,4 +2,4 @@ flake8-polyfill is a package that provides some compatibility helpers
for Flake8 plugins that intend to support Flake8 2.x and 3.x
simultaneously.
-WWW: https://pypi.python.org/pypi/flake8-polyfill
+WWW: https://pypi.org/project/flake8-polyfill/
diff --git a/devel/py-flake8-quotes/pkg-descr b/devel/py-flake8-quotes/pkg-descr
index f380580b7d50..2acae28ccecb 100644
--- a/devel/py-flake8-quotes/pkg-descr
+++ b/devel/py-flake8-quotes/pkg-descr
@@ -1,3 +1,3 @@
Flake8 lint for quotes.
-WWW: https://pypi.python.org/pypi/flake8-quotes
+WWW: https://pypi.org/project/flake8-quotes/
diff --git a/devel/py-flake8/pkg-descr b/devel/py-flake8/pkg-descr
index 6d2c13380c2d..9b02e93a32ab 100644
--- a/devel/py-flake8/pkg-descr
+++ b/devel/py-flake8/pkg-descr
@@ -7,5 +7,5 @@ Flake8 is a wrapper around these tools:
Flake8 runs all tools by launching the single 'flake8' script. It
displays the warnings in a per-file, merged output
-WWW: https://pypi.python.org/pypi/flake8
+WWW: https://pypi.org/project/flake8/
WWW: https://gitlab.com/pycqa/flake8
diff --git a/devel/py-flask-babel/pkg-descr b/devel/py-flask-babel/pkg-descr
index a4518a341e0a..232be858cfe3 100644
--- a/devel/py-flask-babel/pkg-descr
+++ b/devel/py-flask-babel/pkg-descr
@@ -1,3 +1,3 @@
Add i18n/l10n support to Flask applications with the help of the Babel library.
-WWW: https://pypi.python.org/pypi/Flask-Babel
+WWW: https://pypi.org/project/Flask-Babel/
diff --git a/devel/py-flexmock/pkg-descr b/devel/py-flexmock/pkg-descr
index 825d46497ee6..bb47f829eef7 100644
--- a/devel/py-flexmock/pkg-descr
+++ b/devel/py-flexmock/pkg-descr
@@ -18,5 +18,5 @@ flexmock declarations are structured to read more like English sentences than
API calls, and it is possible to chain them together in any order to achieve
high degree of expressiveness in a single line of code.
-WWW: https://pypi.python.org/pypi/flexmock
+WWW: https://pypi.org/project/flexmock/
WWW: https://github.com/bkabrda/flexmock
diff --git a/devel/py-foolscap/pkg-descr b/devel/py-foolscap/pkg-descr
index c44219448ada..1c80b210322e 100644
--- a/devel/py-foolscap/pkg-descr
+++ b/devel/py-foolscap/pkg-descr
@@ -15,4 +15,4 @@ security model, such that once you create a non-public object, it is only
accessible to clients to whom you've given the (unguessable) FURL. You can of
course publish world-visible objects that have well-known FURLs.
-WWW: https://pypi.python.org/pypi/foolscap
+WWW: https://pypi.org/project/foolscap/
diff --git a/devel/py-fusepy/pkg-descr b/devel/py-fusepy/pkg-descr
index 13a270f9248b..11b8d5c27cb9 100644
--- a/devel/py-fusepy/pkg-descr
+++ b/devel/py-fusepy/pkg-descr
@@ -1,4 +1,4 @@
fusepy is a Python module that provides a simple interface to FUSE and
MacFUSE. It's just one file and is implemented using ctypes.
-WWW: https://pypi.python.org/pypi/fusepy
+WWW: https://pypi.org/project/fusepy/
diff --git a/devel/py-futurist/pkg-descr b/devel/py-futurist/pkg-descr
index b73448e34a2b..e365771ecc04 100644
--- a/devel/py-futurist/pkg-descr
+++ b/devel/py-futurist/pkg-descr
@@ -4,4 +4,4 @@ allows for providing a level of transparency in how asynchronous work gets
executed. This library currently adds statistics gathering, an eventlet
executor, a synchronous executor etc.
-WWW: https://pypi.python.org/pypi/futurist
+WWW: https://pypi.org/project/futurist/
diff --git a/devel/py-fuzzywuzzy/pkg-descr b/devel/py-fuzzywuzzy/pkg-descr
index 39e91dc03686..239c0c3893a7 100644
--- a/devel/py-fuzzywuzzy/pkg-descr
+++ b/devel/py-fuzzywuzzy/pkg-descr
@@ -18,4 +18,4 @@ Token Sort Ratio
>>> fuzz.token_sort_ratio("fuzzy wuzzy was a bear", "wuzzy fuzzy was a bear")
100
-WWW: https://pypi.python.org/pypi/naiveBayesClassifier
+WWW: https://pypi.org/project/naiveBayesClassifier/
diff --git a/devel/py-geojson/pkg-descr b/devel/py-geojson/pkg-descr
index bfc0b9df92fd..8706cbadb50d 100644
--- a/devel/py-geojson/pkg-descr
+++ b/devel/py-geojson/pkg-descr
@@ -1,4 +1,4 @@
A reference implementation of the PythonGeoInterface and
the GeoJSON draft.
-WWW: https://pypi.python.org/pypi/geojson
+WWW: https://pypi.org/project/geojson/
diff --git a/devel/py-gevent/pkg-descr b/devel/py-gevent/pkg-descr
index 740e6773beef..c5927d1e9434 100644
--- a/devel/py-gevent/pkg-descr
+++ b/devel/py-gevent/pkg-descr
@@ -16,4 +16,4 @@ implementation and better performance. Read why others use gevent and check out
the list of the open source projects based on gevent.
WWW: http://www.gevent.org/
-WWW: https://pypi.python.org/pypi/gevent
+WWW: https://pypi.org/project/gevent/
diff --git a/devel/py-git-up/pkg-descr b/devel/py-git-up/pkg-descr
index a210eddea2c3..95713ab0ded3 100644
--- a/devel/py-git-up/pkg-descr
+++ b/devel/py-git-up/pkg-descr
@@ -2,4 +2,4 @@ PyGitUp is a Python implementation of the great aanand/git-up/. It
not only fully covers the abilities of git-up and should be a drop-in
replacement, but also extends it slightly.
-WWW: https://pypi.python.org/pypi/git-up
+WWW: https://pypi.org/project/git-up/
diff --git a/devel/py-git_semver/pkg-descr b/devel/py-git_semver/pkg-descr
index 1e6729aac70d..a842c4523d15 100644
--- a/devel/py-git_semver/pkg-descr
+++ b/devel/py-git_semver/pkg-descr
@@ -1,4 +1,4 @@
git-semver is a tiny git addon to manage your project's version numbers.
-WWW: https://pypi.python.org/pypi/git_semver
+WWW: https://pypi.org/project/git_semver/
WWW: https://github.com/hartym/git-semver
diff --git a/devel/py-gitdb2/pkg-descr b/devel/py-gitdb2/pkg-descr
index 4ad0c693ea07..bd7dfefdaa30 100644
--- a/devel/py-gitdb2/pkg-descr
+++ b/devel/py-gitdb2/pkg-descr
@@ -3,5 +3,5 @@ aims at allowing full access to loose objects as well as packs with performance
and scalability in mind. It operates exclusively on streams, allowing to handle
large objects with a small memory footprint.
-WWW: https://pypi.python.org/pypi/gitdb2
+WWW: https://pypi.org/project/gitdb2/
WWW: https://github.com/gitpython-developers/gitdb
diff --git a/devel/py-glance-store/pkg-descr b/devel/py-glance-store/pkg-descr
index 6eb54af1a348..b79a0621845a 100644
--- a/devel/py-glance-store/pkg-descr
+++ b/devel/py-glance-store/pkg-descr
@@ -6,4 +6,4 @@ assets from/to a set of several, different, storage technologies.
This library has been extracted from the Glance source code for the specific use
of the Glance and Glare projects.
-WWW: https://pypi.python.org/pypi/glance_store
+WWW: https://pypi.org/project/glance_store/
diff --git a/devel/py-google-apputils/pkg-descr b/devel/py-google-apputils/pkg-descr
index 082e24ab12f7..de1cffc9558b 100644
--- a/devel/py-google-apputils/pkg-descr
+++ b/devel/py-google-apputils/pkg-descr
@@ -1,3 +1,3 @@
Google application utilities for python.
-WWW: https://pypi.python.org/pypi/google-apputils
+WWW: https://pypi.org/project/google-apputils/
diff --git a/devel/py-greenlet/pkg-descr b/devel/py-greenlet/pkg-descr
index 33b1d6c23004..2db9dea959fb 100644
--- a/devel/py-greenlet/pkg-descr
+++ b/devel/py-greenlet/pkg-descr
@@ -2,4 +2,4 @@ greenlet provides a primitive form of micro-threads in the form of a native
extension module to Python. Higher-level primitives such as coroutine scheduling
are not part of greenlet itself, but can be built upon it.
-WWW: https://pypi.python.org/pypi/greenlet
+WWW: https://pypi.org/project/greenlet/
diff --git a/devel/py-grpcio-tools/pkg-descr b/devel/py-grpcio-tools/pkg-descr
index fd405700235b..829d60fc7d19 100644
--- a/devel/py-grpcio-tools/pkg-descr
+++ b/devel/py-grpcio-tools/pkg-descr
@@ -1,3 +1,3 @@
Protobuf code generator for gRPC.
-WWW: https://pypi.python.org/pypi/grpcio-tools
+WWW: https://pypi.org/project/grpcio-tools/
diff --git a/devel/py-grpcio/pkg-descr b/devel/py-grpcio/pkg-descr
index 8705436b71d2..e17c73dc0382 100644
--- a/devel/py-grpcio/pkg-descr
+++ b/devel/py-grpcio/pkg-descr
@@ -1,3 +1,3 @@
HTTP/2-based RPC framework.
-WWW: https://pypi.python.org/pypi/grpcio
+WWW: https://pypi.org/project/grpcio/
diff --git a/devel/py-gtfslib/pkg-descr b/devel/py-gtfslib/pkg-descr
index 2f1226c127ac..a630a59529ba 100644
--- a/devel/py-gtfslib/pkg-descr
+++ b/devel/py-gtfslib/pkg-descr
@@ -1,4 +1,4 @@
An open source library in python for reading GTFS files and computing various
stats and indicators about Public Transport networks.
-WWW: https://pypi.python.org/pypi/gtfslib
+WWW: https://pypi.org/project/gtfslib/
diff --git a/devel/py-hash_ring/pkg-descr b/devel/py-hash_ring/pkg-descr
index 93a37f82499a..00b09558b65c 100644
--- a/devel/py-hash_ring/pkg-descr
+++ b/devel/py-hash_ring/pkg-descr
@@ -6,4 +6,4 @@ Consistent hashing is a scheme that provides a hash table functionality
in a way that the adding or removing of one slot does not significantly
change the mapping of keys to slots.
-WWW: https://pypi.python.org/pypi/hash_ring
+WWW: https://pypi.org/project/hash_ring/
diff --git a/devel/py-http-prompt/pkg-descr b/devel/py-http-prompt/pkg-descr
index e57566e19d58..09ec3a560d01 100644
--- a/devel/py-http-prompt/pkg-descr
+++ b/devel/py-http-prompt/pkg-descr
@@ -1,4 +1,4 @@
HTTP Prompt is an interactive command-line HTTP client featuring autocomplete
and syntax highlighting, built on HTTPie and prompt_toolkit.
-WWW: https://pypi.python.org/pypi/http-prompt
+WWW: https://pypi.org/project/http-prompt/
diff --git a/devel/py-incremental/pkg-descr b/devel/py-incremental/pkg-descr
index 91762bcbec7a..8e33bddc160b 100644
--- a/devel/py-incremental/pkg-descr
+++ b/devel/py-incremental/pkg-descr
@@ -1,3 +1,3 @@
A small library that versions your Python projects.
-WWW: https://pypi.python.org/pypi/incremental
+WWW: https://pypi.org/project/incremental/
diff --git a/devel/py-inflect/pkg-descr b/devel/py-inflect/pkg-descr
index 0a2a35c8d2f9..7e3232e9a736 100644
--- a/devel/py-inflect/pkg-descr
+++ b/devel/py-inflect/pkg-descr
@@ -1,4 +1,4 @@
Correctly generate plurals, singular nouns, ordinals, indefinite
articles; convert numbers to words
-WWW: https://pypi.python.org/pypi/inflect
+WWW: https://pypi.org/project/inflect/
diff --git a/devel/py-initgroups/pkg-descr b/devel/py-initgroups/pkg-descr
index 556cb4f86f47..7c81c7480534 100644
--- a/devel/py-initgroups/pkg-descr
+++ b/devel/py-initgroups/pkg-descr
@@ -1,4 +1,4 @@
initgroups provides a convenience function to deal with
user/group ids on Unix-style systems.
-WWW: https://pypi.python.org/pypi/initgroups
+WWW: https://pypi.org/project/initgroups/
diff --git a/devel/py-ipdb/pkg-descr b/devel/py-ipdb/pkg-descr
index 606feb6214ac..f2708be9d526 100644
--- a/devel/py-ipdb/pkg-descr
+++ b/devel/py-ipdb/pkg-descr
@@ -2,5 +2,5 @@ ipdb exports functions to access the IPython debugger, which features tab
completion, syntax highlighting, better tracebacks, better introspection with
the same interface as the pdb module.
-WWW: https://pypi.python.org/pypi/ipdb
+WWW: https://pypi.org/project/ipdb/
WWW: https://github.com/gotcha/ipdb
diff --git a/devel/py-ipython_genutils/pkg-descr b/devel/py-ipython_genutils/pkg-descr
index 11c609efc5f8..f42f0add4489 100644
--- a/devel/py-ipython_genutils/pkg-descr
+++ b/devel/py-ipython_genutils/pkg-descr
@@ -1,3 +1,3 @@
Vestigial utilities from IPython.
-WWW: https://pypi.python.org/pypi/ipython_genutils
+WWW: https://pypi.org/project/ipython_genutils/
diff --git a/devel/py-isodate/pkg-descr b/devel/py-isodate/pkg-descr
index 3fd3baa2067b..2a4e6e5ea862 100644
--- a/devel/py-isodate/pkg-descr
+++ b/devel/py-isodate/pkg-descr
@@ -16,4 +16,4 @@ the Python date and datetime classes. Additionally fractional seconds are
limited to microseconds. That means if the parser finds for instance nanoseconds
it will round it to microseconds.
-WWW: https://pypi.python.org/pypi/isodate
+WWW: https://pypi.org/project/isodate/
diff --git a/devel/py-isort/pkg-descr b/devel/py-isort/pkg-descr
index 2c30c28b4fe9..96dcefa6ac59 100644
--- a/devel/py-isort/pkg-descr
+++ b/devel/py-isort/pkg-descr
@@ -2,5 +2,5 @@ isort is a Python utility/library to sort imports alphabetically, and
automatically separated into sections. It provides a command line utility,
Python library and plugins for various editors to quickly sort all your imports.
-WWW: https://pypi.python.org/pypi/isort
+WWW: https://pypi.org/project/isort/
WWW: https://github.com/timothycrosley/isort
diff --git a/devel/py-iterpipes/pkg-descr b/devel/py-iterpipes/pkg-descr
index d07902c4cedf..2881fd3dcc78 100644
--- a/devel/py-iterpipes/pkg-descr
+++ b/devel/py-iterpipes/pkg-descr
@@ -1,3 +1,3 @@
A library for running shell pipelines using shell-like syntax
-WWW: https://pypi.python.org/pypi/iterpipes
+WWW: https://pypi.org/project/iterpipes/
diff --git a/devel/py-jaraco.classes/pkg-descr b/devel/py-jaraco.classes/pkg-descr
index bc3e18cbde84..35397a05c6cb 100644
--- a/devel/py-jaraco.classes/pkg-descr
+++ b/devel/py-jaraco.classes/pkg-descr
@@ -1,4 +1,4 @@
Routines for obtaining the class names of an object and its parent
classes.
-WWW: https://pypi.python.org/pypi/jaraco.classes
+WWW: https://pypi.org/project/jaraco.classes/
diff --git a/devel/py-jaraco.functools/pkg-descr b/devel/py-jaraco.functools/pkg-descr
index 9f25cd57772f..306c0a01d30f 100644
--- a/devel/py-jaraco.functools/pkg-descr
+++ b/devel/py-jaraco.functools/pkg-descr
@@ -1,3 +1,3 @@
Additional functools in the spirit of stdlib's functools.
-WWW: https://pypi.python.org/pypi/jaraco.text
+WWW: https://pypi.org/project/jaraco.text/
diff --git a/devel/py-jaraco.logging/pkg-descr b/devel/py-jaraco.logging/pkg-descr
index 4d80af1274dc..6f62826ffc2a 100644
--- a/devel/py-jaraco.logging/pkg-descr
+++ b/devel/py-jaraco.logging/pkg-descr
@@ -1,3 +1,3 @@
Additional facilities to supplement Python's stdlib logging module.
-WWW: https://pypi.python.org/pypi/jaraco.logging
+WWW: https://pypi.org/project/jaraco.logging/
diff --git a/devel/py-jaraco.util/pkg-descr b/devel/py-jaraco.util/pkg-descr
index a0c97a688472..2c6dd796e64c 100644
--- a/devel/py-jaraco.util/pkg-descr
+++ b/devel/py-jaraco.util/pkg-descr
@@ -4,4 +4,4 @@ functions.
They're designed to be intuitively named and self-documenting (many with
extensive doctests).
-WWW: https://pypi.python.org/pypi/jaraco.util
+WWW: https://pypi.org/project/jaraco.util/
diff --git a/devel/py-jcc/pkg-descr b/devel/py-jcc/pkg-descr
index 482870982d1d..8393757ceca2 100644
--- a/devel/py-jcc/pkg-descr
+++ b/devel/py-jcc/pkg-descr
@@ -9,4 +9,4 @@ Python interpreter. JCC attempts to make these Python types pythonic by
detecting iterators and property accessors. Iterators and mappings may
also be declared to JCC.
-WWW: https://pypi.python.org/pypi/JCC
+WWW: https://pypi.org/project/JCC/
diff --git a/devel/py-jsmin/pkg-descr b/devel/py-jsmin/pkg-descr
index 48dfc935e690..a8b2b5275002 100644
--- a/devel/py-jsmin/pkg-descr
+++ b/devel/py-jsmin/pkg-descr
@@ -1,3 +1,3 @@
JavaScript minifier written in Python.
-WWW: https://pypi.python.org/pypi/jsmin
+WWW: https://pypi.org/project/jsmin/
diff --git a/devel/py-jsonlib/pkg-descr b/devel/py-jsonlib/pkg-descr
index 313d048e52e1..5ce47d762a1e 100644
--- a/devel/py-jsonlib/pkg-descr
+++ b/devel/py-jsonlib/pkg-descr
@@ -4,4 +4,4 @@ server and user agent. This module aims to produce
a library for serializing and deserializing JSON
that conforms strictly to RFC 4627.
-WWW: https://pypi.python.org/pypi/jsonlib
+WWW: https://pypi.org/project/jsonlib/
diff --git a/devel/py-jsonlib2/pkg-descr b/devel/py-jsonlib2/pkg-descr
index be12a4c68411..3e4776bf5fa7 100644
--- a/devel/py-jsonlib2/pkg-descr
+++ b/devel/py-jsonlib2/pkg-descr
@@ -4,4 +4,4 @@ server and user agent. This module aims to produce
a library for serializing and deserializing JSON
that conforms strictly to RFC 4627.
-WWW: https://pypi.python.org/pypi/jsonlib2
+WWW: https://pypi.org/project/jsonlib2/
diff --git a/devel/py-jsonlines/pkg-descr b/devel/py-jsonlines/pkg-descr
index 3f19ea7c3bb6..63e25ecf6dcd 100644
--- a/devel/py-jsonlines/pkg-descr
+++ b/devel/py-jsonlines/pkg-descr
@@ -1,5 +1,5 @@
jsonlines is a Python library to simplify working with jsonlines and ndjson
data.
-WWW: https://pypi.python.org/pypi/jsonlines
+WWW: https://pypi.org/project/jsonlines/
WWW: https://github.com/wbolster/jsonlines
diff --git a/devel/py-jsonpointer/pkg-descr b/devel/py-jsonpointer/pkg-descr
index 7657c87f3dbf..967b3b7afd7f 100644
--- a/devel/py-jsonpointer/pkg-descr
+++ b/devel/py-jsonpointer/pkg-descr
@@ -1,3 +1,3 @@
Library to resolve JSON Pointers according to RFC 6901.
-WWW: https://pypi.python.org/pypi/jsonpointer
+WWW: https://pypi.org/project/jsonpointer/
diff --git a/devel/py-jsonref/pkg-descr b/devel/py-jsonref/pkg-descr
index d0b1e022b7ea..4ffa7f6e78c8 100644
--- a/devel/py-jsonref/pkg-descr
+++ b/devel/py-jsonref/pkg-descr
@@ -1,3 +1,3 @@
An implementation of JSON Reference for Python
-WWW: https://pypi.python.org/pypi/jsonref
+WWW: https://pypi.org/project/jsonref/
diff --git a/devel/py-jsonrpclib-pelix/pkg-descr b/devel/py-jsonrpclib-pelix/pkg-descr
index b2e9f9b6d184..f23b4c0558e6 100644
--- a/devel/py-jsonrpclib-pelix/pkg-descr
+++ b/devel/py-jsonrpclib-pelix/pkg-descr
@@ -2,4 +2,4 @@ This project is an implementation of the JSON-RPC v2.0 specification
(backwards-compatible) as a client library. This version is a fork of jsonrpclib
by Josh Marshall, usable with Pelix remote services.
-WWW: https://pypi.python.org/pypi/jsonrpclib-pelix
+WWW: https://pypi.org/project/jsonrpclib-pelix/
diff --git a/devel/py-kaptan/pkg-descr b/devel/py-kaptan/pkg-descr
index 853436a2bdd0..c5ca3ba7872d 100644
--- a/devel/py-kaptan/pkg-descr
+++ b/devel/py-kaptan/pkg-descr
@@ -1,5 +1,5 @@
kaptan is a configuration parser which supports dict, ini, json, yaml and python
files.
-WWW: https://pypi.python.org/pypi/kaptan
+WWW: https://pypi.org/project/kaptan/
WWW: https://github.com/emre/kaptan
diff --git a/devel/py-kayako/pkg-descr b/devel/py-kayako/pkg-descr
index 59c1c02360c5..620ba588f359 100644
--- a/devel/py-kayako/pkg-descr
+++ b/devel/py-kayako/pkg-descr
@@ -1,3 +1,3 @@
Python API Wrapper for Kayako 4.01.240
-WWW: https://pypi.python.org/pypi/kayako
+WWW: https://pypi.org/project/kayako/
diff --git a/devel/py-kazoo/pkg-descr b/devel/py-kazoo/pkg-descr
index a428797636d6..ba72977d75fa 100644
--- a/devel/py-kazoo/pkg-descr
+++ b/devel/py-kazoo/pkg-descr
@@ -1,4 +1,4 @@
Kazoo is a Python library designed to make working with Zookeeper a more
hassle-free experience that is less prone to errors.
-WWW: https://pypi.python.org/pypi/kazoo
+WWW: https://pypi.org/project/kazoo/
diff --git a/devel/py-kitchen/pkg-descr b/devel/py-kitchen/pkg-descr
index f366cbb52e05..0e0d533a07dd 100644
--- a/devel/py-kitchen/pkg-descr
+++ b/devel/py-kitchen/pkg-descr
@@ -1,4 +1,4 @@
Kitchen aims to pull these small snippets of code into a few python modules
which you can import and use within your project.
-WWW: https://pypi.python.org/pypi/kitchen
+WWW: https://pypi.org/project/kitchen/
diff --git a/devel/py-lazy-object-proxy/pkg-descr b/devel/py-lazy-object-proxy/pkg-descr
index c0585234647b..4f90f903ad24 100644
--- a/devel/py-lazy-object-proxy/pkg-descr
+++ b/devel/py-lazy-object-proxy/pkg-descr
@@ -1,4 +1,4 @@
A fast and thorough lazy object proxy.
-WWW: https://pypi.python.org/pypi/lazy-object-proxy
+WWW: https://pypi.org/project/lazy-object-proxy/
WWW: https://github.com/ionelmc/python-lazy-object-proxy
diff --git a/devel/py-lazy/pkg-descr b/devel/py-lazy/pkg-descr
index 63053785d268..5d9fc98a7105 100644
--- a/devel/py-lazy/pkg-descr
+++ b/devel/py-lazy/pkg-descr
@@ -2,4 +2,4 @@ The lazy module provides a decorator to create lazy attributes. A lazy
attribute is a computed attribute that is evaluated only once, the first
time it is used. Subsequent uses return the results of the first call.
-WWW: https://pypi.python.org/pypi/lazy
+WWW: https://pypi.org/project/lazy/
diff --git a/devel/py-levenshtein/pkg-descr b/devel/py-levenshtein/pkg-descr
index 9840772862e7..d4cd6fdfc01c 100644
--- a/devel/py-levenshtein/pkg-descr
+++ b/devel/py-levenshtein/pkg-descr
@@ -3,4 +3,4 @@ medians and set medians of Strings and Unicodes. Because it's implemented
in C, it's much faster than corresponding Python library functions and
methods.
-WWW: https://pypi.python.org/pypi/python-Levenshtein
+WWW: https://pypi.org/project/python-Levenshtein/
diff --git a/devel/py-libtaxii/pkg-descr b/devel/py-libtaxii/pkg-descr
index eeb513cbdf45..be944673570c 100644
--- a/devel/py-libtaxii/pkg-descr
+++ b/devel/py-libtaxii/pkg-descr
@@ -1,3 +1,3 @@
A Python library for handling TAXII Messages and invoking TAXII Services.
-WWW: https://pypi.python.org/pypi/libtaxii
+WWW: https://pypi.org/project/libtaxii/
diff --git a/devel/py-libtmux/pkg-descr b/devel/py-libtmux/pkg-descr
index 16eefaf80876..f9f2f0a64f4a 100644
--- a/devel/py-libtmux/pkg-descr
+++ b/devel/py-libtmux/pkg-descr
@@ -3,5 +3,5 @@ libtmux is the tool behind tmuxp, a tmux workspace manager in python.
It builds upon tmux's target and formats to create an object mapping to
traverse, inspect and interact with live tmux sessions.
-WWW: https://pypi.python.org/pypi/libtmux
+WWW: https://pypi.org/project/libtmux/
WWW: https://github.com/tmux-python/libtmux
diff --git a/devel/py-libusb1/pkg-descr b/devel/py-libusb1/pkg-descr
index 7ac69fdd45a2..2d0775142396 100644
--- a/devel/py-libusb1/pkg-descr
+++ b/devel/py-libusb1/pkg-descr
@@ -1,3 +1,3 @@
Pure-python wrapper for libusb-1.0.
-WWW: https://pypi.python.org/pypi/libusb1
+WWW: https://pypi.org/project/libusb1/
diff --git a/devel/py-libversion/pkg-descr b/devel/py-libversion/pkg-descr
index 0dd1e79e755e..47bcf4425df9 100644
--- a/devel/py-libversion/pkg-descr
+++ b/devel/py-libversion/pkg-descr
@@ -1,4 +1,4 @@
Python bindings for libversion, which provides fast, powerful
and correct generic version string comparison algorithm.
-WWW: https://pypi.python.org/pypi/libversion
+WWW: https://pypi.org/project/libversion/
diff --git a/devel/py-linecache2/pkg-descr b/devel/py-linecache2/pkg-descr
index de57c20bb4be..a23683385bcb 100644
--- a/devel/py-linecache2/pkg-descr
+++ b/devel/py-linecache2/pkg-descr
@@ -1,3 +1,3 @@
A backport of linecache to older supported Pythons.
-WWW: https://pypi.python.org/pypi/linecache2
+WWW: https://pypi.org/project/linecache2/
diff --git a/devel/py-logan/pkg-descr b/devel/py-logan/pkg-descr
index 744f341ba6e5..b568e8195255 100644
--- a/devel/py-logan/pkg-descr
+++ b/devel/py-logan/pkg-descr
@@ -2,5 +2,5 @@ Logan is a toolkit for running standalone Django applications. It provides you
with tools to create a CLI runner, manage settings, and the ability to bootstrap
the process.
-WWW: https://pypi.python.org/pypi/logan
+WWW: https://pypi.org/project/logan/
WWW: https://github.com/dcramer/logan
diff --git a/devel/py-logilab-common/pkg-descr b/devel/py-logilab-common/pkg-descr
index 11b0d7f53c2f..ad66e416644f 100644
--- a/devel/py-logilab-common/pkg-descr
+++ b/devel/py-logilab-common/pkg-descr
@@ -1,5 +1,5 @@
The package logilab.common contains several modules providing low level
functionalities shared among some python projects developed by logilab.
-WWW: https://pypi.python.org/pypi/logilab-common
+WWW: https://pypi.org/project/logilab-common/
WWW: https://www.logilab.org/project/logilab-common
diff --git a/devel/py-manuel/pkg-descr b/devel/py-manuel/pkg-descr
index 1cc6cacd869d..334c60022c68 100644
--- a/devel/py-manuel/pkg-descr
+++ b/devel/py-manuel/pkg-descr
@@ -1,3 +1,3 @@
Manuel lets you build tested documentation.
-WWW: https://pypi.python.org/pypi/manuel
+WWW: https://pypi.org/project/manuel/
diff --git a/devel/py-marshmallow/pkg-descr b/devel/py-marshmallow/pkg-descr
index f35ed1e0205d..0da0e9c2a55a 100644
--- a/devel/py-marshmallow/pkg-descr
+++ b/devel/py-marshmallow/pkg-descr
@@ -1,4 +1,4 @@
Marshmallow is an ORM/ODM/framework-agnostic library for converting
complex datatypes, such as objects, to and from native Python datatypes.
-WWW: https://pypi.python.org/pypi/marshmallow
+WWW: https://pypi.org/project/marshmallow/
diff --git a/devel/py-mccabe/pkg-descr b/devel/py-mccabe/pkg-descr
index e7e934739d13..0c4159bfd186 100644
--- a/devel/py-mccabe/pkg-descr
+++ b/devel/py-mccabe/pkg-descr
@@ -2,5 +2,5 @@ Ned's script to check McCabe complexity.
This module provides a plugin for flake8, the Python code checker.
-WWW: https://pypi.python.org/pypi/mccabe
+WWW: https://pypi.org/project/mccabe/
WWW: https://github.com/flintwork/mccabe
diff --git a/devel/py-mdv/pkg-descr b/devel/py-mdv/pkg-descr
index 4a7bb6dd7dd4..ceef818501fe 100644
--- a/devel/py-mdv/pkg-descr
+++ b/devel/py-mdv/pkg-descr
@@ -9,4 +9,4 @@ user output, e.g. for help texts.
This is where mdv, a Python based Markdown viewer for the terminal might be a
good option.
-WWW: https://pypi.python.org/pypi/mdv
+WWW: https://pypi.org/project/mdv/
diff --git a/devel/py-memory_profiler/pkg-descr b/devel/py-memory_profiler/pkg-descr
index fc010bca9894..e60dfd7d20d2 100644
--- a/devel/py-memory_profiler/pkg-descr
+++ b/devel/py-memory_profiler/pkg-descr
@@ -2,5 +2,5 @@ This is a python module for monitoring memory consumption of a process as well
as line-by-line analysis of memory consumption for python programs. It is a pure
python module which depends on the psutil module.
-WWW: https://pypi.python.org/pypi/memory_profiler
+WWW: https://pypi.org/project/memory_profiler/
WWW: https://github.com/pythonprofilers/memory_profiler
diff --git a/devel/py-microversion-parse/pkg-descr b/devel/py-microversion-parse/pkg-descr
index c914a1fc3daa..4ed493d678e8 100644
--- a/devel/py-microversion-parse/pkg-descr
+++ b/devel/py-microversion-parse/pkg-descr
@@ -1,3 +1,3 @@
OpenStack microversion header parser
-WWW: https://pypi.python.org/pypi/microversion_parse
+WWW: https://pypi.org/project/microversion_parse/
diff --git a/devel/py-mock/pkg-descr b/devel/py-mock/pkg-descr
index eb785d52274e..ea05dd3b6b3f 100644
--- a/devel/py-mock/pkg-descr
+++ b/devel/py-mock/pkg-descr
@@ -6,4 +6,4 @@ After performing an action, you can make assertions about which methods /
attributes were used and arguments they were called with. You can also specify
return values and set needed attributes in the normal way.
-WWW: https://pypi.python.org/pypi/mock
+WWW: https://pypi.org/project/mock/
diff --git a/devel/py-mox/pkg-descr b/devel/py-mox/pkg-descr
index 8a9ef74fdd2a..b7a3920131f8 100644
--- a/devel/py-mox/pkg-descr
+++ b/devel/py-mox/pkg-descr
@@ -1,4 +1,4 @@
Mox is an open source mock object framework for Python, inspired by the Java
library EasyMock.
-WWW: https://pypi.python.org/pypi/mox
+WWW: https://pypi.org/project/mox/
diff --git a/devel/py-multipledispatch/pkg-descr b/devel/py-multipledispatch/pkg-descr
index f726d71863ff..ca74a95cba08 100644
--- a/devel/py-multipledispatch/pkg-descr
+++ b/devel/py-multipledispatch/pkg-descr
@@ -4,4 +4,4 @@ This implementation of multiple dispatch is efficient, mostly complete,
performs static analysis to avoid conflicts, and provides optional namespace
support. It looks good too.
-WWW: https://pypi.python.org/pypi/multipledispatch
+WWW: https://pypi.org/project/multipledispatch/
diff --git a/devel/py-mwlib.rl/pkg-descr b/devel/py-mwlib.rl/pkg-descr
index 44daa96fe529..908fb15b639b 100644
--- a/devel/py-mwlib.rl/pkg-descr
+++ b/devel/py-mwlib.rl/pkg-descr
@@ -1,4 +1,4 @@
py-mwlib.rl provides a library for writing pdf documents from mediawiki
articles which were parsed by the mwlib library.
-WWW: https://pypi.python.org/pypi/mwlib.rl
+WWW: https://pypi.org/project/mwlib.rl/
diff --git a/devel/py-mwlib/pkg-descr b/devel/py-mwlib/pkg-descr
index 0aa15e213d2c..3ed78e62d38e 100644
--- a/devel/py-mwlib/pkg-descr
+++ b/devel/py-mwlib/pkg-descr
@@ -1,3 +1,3 @@
py-mwlib provides a library for parsing mediawiki articles.
-WWW: https://pypi.python.org/pypi/mwlib
+WWW: https://pypi.org/project/mwlib/
diff --git a/devel/py-nagioscheck/pkg-descr b/devel/py-nagioscheck/pkg-descr
index fbf277d9550f..a3b2c0513071 100644
--- a/devel/py-nagioscheck/pkg-descr
+++ b/devel/py-nagioscheck/pkg-descr
@@ -4,4 +4,4 @@ pynagioscheck strives to conform to the practices described in the Nagios
Plug-in Development Guidelines and, more importantly, save valuable system
administrator time.
-WWW: https://pypi.python.org/pypi/nagioscheck
+WWW: https://pypi.org/project/nagioscheck/
diff --git a/devel/py-naiveBayesClassifier/pkg-descr b/devel/py-naiveBayesClassifier/pkg-descr
index 4092d20c711c..97a0ce1cfc76 100644
--- a/devel/py-naiveBayesClassifier/pkg-descr
+++ b/devel/py-naiveBayesClassifier/pkg-descr
@@ -18,4 +18,4 @@ considers each of these features to contribute independently to the probability
that this fruit is an apple, regardless of any possible correlations between
the color, roundness, and diameter features.
-WWW: https://pypi.python.org/pypi/naiveBayesClassifier
+WWW: https://pypi.org/project/naiveBayesClassifier/
diff --git a/devel/py-nose-cov/pkg-descr b/devel/py-nose-cov/pkg-descr
index c85e18744789..f292b8ea40b9 100644
--- a/devel/py-nose-cov/pkg-descr
+++ b/devel/py-nose-cov/pkg-descr
@@ -1,3 +1,3 @@
nose plugin for coverage reporting, including subprocesses and multiprocessing.
-WWW: https://pypi.python.org/pypi/nose-cov
+WWW: https://pypi.org/project/nose-cov/
diff --git a/devel/py-oletools/pkg-descr b/devel/py-oletools/pkg-descr
index 8e1e1c2509df..725f0d7718d5 100644
--- a/devel/py-oletools/pkg-descr
+++ b/devel/py-oletools/pkg-descr
@@ -3,4 +3,4 @@ Structured Storage, Compound File Binary Format or Compound Document File
Format), such as Microsoft Office documents, for Malware Analysis and Incident
Response.
-WWW: https://pypi.python.org/pypi/oletools
+WWW: https://pypi.org/project/oletools/
diff --git a/devel/py-openstacksdk/pkg-descr b/devel/py-openstacksdk/pkg-descr
index 083b3ae24d98..41b5b922acbb 100644
--- a/devel/py-openstacksdk/pkg-descr
+++ b/devel/py-openstacksdk/pkg-descr
@@ -4,4 +4,4 @@ provide a consistent and complete set of interactions with
OpenStack's many services, along with complete documentation,
examples, and tools.
-WWW: https://pypi.python.org/pypi/python-openstacksdk
+WWW: https://pypi.org/project/python-openstacksdk/
diff --git a/devel/py-opster/pkg-descr b/devel/py-opster/pkg-descr
index adfbb101ae72..a201ec86e780 100644
--- a/devel/py-opster/pkg-descr
+++ b/devel/py-opster/pkg-descr
@@ -4,5 +4,5 @@ dictionaries, etc) to define options, which makes configuration clear
and concise. Additionally it contains possibility to handle subcommands
(i.e. hg commit or svn update).
-WWW: https://pypi.python.org/pypi/opster
+WWW: https://pypi.org/project/opster/
WWW: https://github.com/piranha/opster/
diff --git a/devel/py-ordereddict/pkg-descr b/devel/py-ordereddict/pkg-descr
index 472701eeb975..00588f660ab0 100644
--- a/devel/py-ordereddict/pkg-descr
+++ b/devel/py-ordereddict/pkg-descr
@@ -3,4 +3,4 @@ recipe has big-oh performance that matches regular dictionaries
(amortized O(1) insertion/deletion/lookup and O(n)
iteration/repr/copy/equality_testing).
-WWW: https://pypi.python.org/pypi/ordereddict
+WWW: https://pypi.org/project/ordereddict/
diff --git a/devel/py-os-brick/pkg-descr b/devel/py-os-brick/pkg-descr
index f94c4744731e..1d9f01f79c02 100644
--- a/devel/py-os-brick/pkg-descr
+++ b/devel/py-os-brick/pkg-descr
@@ -1,3 +1,3 @@
OpenStack Cinder brick library for managing local volume attaches
-WWW: https://pypi.python.org/pypi/os-brick
+WWW: https://pypi.org/project/os-brick/
diff --git a/devel/py-os-client-config/pkg-descr b/devel/py-os-client-config/pkg-descr
index e0d4c823e0de..e2e8922819f0 100644
--- a/devel/py-os-client-config/pkg-descr
+++ b/devel/py-os-client-config/pkg-descr
@@ -3,4 +3,4 @@ using an OpenStack cloud in a consistent and comprehensive manner.
It will find cloud config for as few as 1 cloud and as many as you
want to put in a config file.
-WWW: https://pypi.python.org/pypi/os-client-config
+WWW: https://pypi.org/project/os-client-config/
diff --git a/devel/py-os-vif/pkg-descr b/devel/py-os-vif/pkg-descr
index 764494979dcd..e75aad05ff6d 100644
--- a/devel/py-os-vif/pkg-descr
+++ b/devel/py-os-vif/pkg-descr
@@ -1,3 +1,3 @@
A library for plugging and unplugging virtual interfaces in OpenStack.
-WWW: https://pypi.python.org/pypi/os-vif
+WWW: https://pypi.org/project/os-vif/
diff --git a/devel/py-os-win/pkg-descr b/devel/py-os-win/pkg-descr
index dc1fb3f7b919..74c115f12833 100644
--- a/devel/py-os-win/pkg-descr
+++ b/devel/py-os-win/pkg-descr
@@ -1,3 +1,3 @@
Windows / Hyper-V library for OpenStack projects.
-WWW: https://pypi.python.org/pypi/os-win
+WWW: https://pypi.org/project/os-win/
diff --git a/devel/py-osc-lib/pkg-descr b/devel/py-osc-lib/pkg-descr
index 689ceef55e6c..48ffa3069a8d 100644
--- a/devel/py-osc-lib/pkg-descr
+++ b/devel/py-osc-lib/pkg-descr
@@ -1,4 +1,4 @@
OpenStackClient (aka OSC) is a command-line client for OpenStack.
osc-lib is a package of common support modules for writing OSC plugins.
-WWW: https://pypi.python.org/pypi/osc-lib
+WWW: https://pypi.org/project/osc-lib/
diff --git a/devel/py-oslo.cache/pkg-descr b/devel/py-oslo.cache/pkg-descr
index 07fc1db57948..e4382f0abb63 100644
--- a/devel/py-oslo.cache/pkg-descr
+++ b/devel/py-oslo.cache/pkg-descr
@@ -3,4 +3,4 @@ by wrapping the dogpile.cache library. The dogpile.cache library provides
support memoization, key value storage and interfaces to common caching
backends such as Memcached.
-WWW: https://pypi.python.org/pypi/oslo.cache
+WWW: https://pypi.org/project/oslo.cache/
diff --git a/devel/py-oslo.concurrency/pkg-descr b/devel/py-oslo.concurrency/pkg-descr
index d73120c075dd..25c56c67aa6d 100644
--- a/devel/py-oslo.concurrency/pkg-descr
+++ b/devel/py-oslo.concurrency/pkg-descr
@@ -2,4 +2,4 @@ The oslo.concurrency library has utilities for safely running multi-thread,
multi-process applications using locking mechanisms and for running external
processes.
-WWW: https://pypi.python.org/pypi/oslo.concurrency
+WWW: https://pypi.org/project/oslo.concurrency/
diff --git a/devel/py-oslo.context/pkg-descr b/devel/py-oslo.context/pkg-descr
index aec5481f8d46..0cbfde186b6f 100644
--- a/devel/py-oslo.context/pkg-descr
+++ b/devel/py-oslo.context/pkg-descr
@@ -2,4 +2,4 @@ The Oslo context library has helpers to maintain useful information about a
request context. The request context is usually populated in the WSGI pipeline
and used by various modules such as logging.
-WWW: https://pypi.python.org/pypi/oslo.context
+WWW: https://pypi.org/project/oslo.context/
diff --git a/devel/py-oslo.db/pkg-descr b/devel/py-oslo.db/pkg-descr
index 5a46e255aa25..ba6d2a56400c 100644
--- a/devel/py-oslo.db/pkg-descr
+++ b/devel/py-oslo.db/pkg-descr
@@ -1,4 +1,4 @@
The oslo db (database) handling library, provides database connectivity to
different database backends and various other helper utils.
-WWW: https://pypi.python.org/pypi/oslo.db
+WWW: https://pypi.org/project/oslo.db/
diff --git a/devel/py-oslo.log/pkg-descr b/devel/py-oslo.log/pkg-descr
index 452f4572473e..64f02bed3d52 100644
--- a/devel/py-oslo.log/pkg-descr
+++ b/devel/py-oslo.log/pkg-descr
@@ -2,4 +2,4 @@ The oslo.log (logging) configuration library provides standardized
configuration for all openstack projects. It also provides custom formatters,
handlers and support for context specific logging.
-WWW: https://pypi.python.org/pypi/oslo.log
+WWW: https://pypi.org/project/oslo.log/
diff --git a/devel/py-oslo.messaging/pkg-descr b/devel/py-oslo.messaging/pkg-descr
index d15018f65f88..576961c876c1 100644
--- a/devel/py-oslo.messaging/pkg-descr
+++ b/devel/py-oslo.messaging/pkg-descr
@@ -1,4 +1,4 @@
The Oslo messaging API supports RPC and notifications over a number of
different messaging transports.
-WWW: https://pypi.python.org/pypi/oslo.messaging
+WWW: https://pypi.org/project/oslo.messaging/
diff --git a/devel/py-oslo.middleware/pkg-descr b/devel/py-oslo.middleware/pkg-descr
index ed9885d45966..f4ebdc0a6d9b 100644
--- a/devel/py-oslo.middleware/pkg-descr
+++ b/devel/py-oslo.middleware/pkg-descr
@@ -3,4 +3,4 @@ pipelines to intercept request/response flows. The base class can be enhanced
with functionality like add/delete/modification of http headers and support
for limiting size/connection etc.
-WWW: https://pypi.python.org/pypi/oslo.middleware
+WWW: https://pypi.org/project/oslo.middleware/
diff --git a/devel/py-oslo.privsep/pkg-descr b/devel/py-oslo.privsep/pkg-descr
index 193af157a3d0..5e15c4bdd373 100644
--- a/devel/py-oslo.privsep/pkg-descr
+++ b/devel/py-oslo.privsep/pkg-descr
@@ -1,3 +1,3 @@
OpenStack library for privilege separation
-WWW: https://pypi.python.org/pypi/oslo.privsep
+WWW: https://pypi.org/project/oslo.privsep/
diff --git a/devel/py-oslo.reports/pkg-descr b/devel/py-oslo.reports/pkg-descr
index a81d8085a7fd..87cdb5d7f9ea 100644
--- a/devel/py-oslo.reports/pkg-descr
+++ b/devel/py-oslo.reports/pkg-descr
@@ -1,3 +1,3 @@
oslo.reports library
-WWW: https://pypi.python.org/pypi/oslo.reports
+WWW: https://pypi.org/project/oslo.reports/
diff --git a/devel/py-oslo.rootwrap/pkg-descr b/devel/py-oslo.rootwrap/pkg-descr
index 47f2e5bb53df..d195206f4fe8 100644
--- a/devel/py-oslo.rootwrap/pkg-descr
+++ b/devel/py-oslo.rootwrap/pkg-descr
@@ -1,3 +1,3 @@
Oslo Rootwrap
-WWW: https://pypi.python.org/pypi/oslo.rootwrap
+WWW: https://pypi.org/project/oslo.rootwrap/
diff --git a/devel/py-oslo.service/pkg-descr b/devel/py-oslo.service/pkg-descr
index 296334e3033e..d7476c8b07bd 100644
--- a/devel/py-oslo.service/pkg-descr
+++ b/devel/py-oslo.service/pkg-descr
@@ -3,4 +3,4 @@ the patterns established by other OpenStack applications. It also includes
utilities long-running applications might need for working with SSL or WSGI,
performing periodic operations, interacting with systemd, etc.
-WWW: https://pypi.python.org/pypi/oslo.service
+WWW: https://pypi.org/project/oslo.service/
diff --git a/devel/py-oslo.versionedobjects/pkg-descr b/devel/py-oslo.versionedobjects/pkg-descr
index 90aef24e5f01..388fd89214dc 100644
--- a/devel/py-oslo.versionedobjects/pkg-descr
+++ b/devel/py-oslo.versionedobjects/pkg-descr
@@ -1,3 +1,3 @@
Oslo Versioned Objects library
-WWW: https://pypi.python.org/pypi/oslo.versionedobjects
+WWW: https://pypi.org/project/oslo.versionedobjects/
diff --git a/devel/py-oslo.vmware/pkg-descr b/devel/py-oslo.vmware/pkg-descr
index be5c6b186335..5390b7b8a40f 100644
--- a/devel/py-oslo.vmware/pkg-descr
+++ b/devel/py-oslo.vmware/pkg-descr
@@ -1,3 +1,3 @@
The Oslo VMware library provides support for common VMware operations and APIs.
-WWW: https://pypi.python.org/pypi/oslo.vmware
+WWW: https://pypi.org/project/oslo.vmware/
diff --git a/devel/py-osprofiler/pkg-descr b/devel/py-osprofiler/pkg-descr
index d477edba621c..45f0fd7256aa 100644
--- a/devel/py-osprofiler/pkg-descr
+++ b/devel/py-osprofiler/pkg-descr
@@ -5,4 +5,4 @@ services. This trace can then be extracted and used to build a tree of calls
which can be quite handy for a variety of reasons (for example in isolating
cross-project performance issues).
-WWW: https://pypi.python.org/pypi/osprofiler
+WWW: https://pypi.org/project/osprofiler/
diff --git a/devel/py-packaging/pkg-descr b/devel/py-packaging/pkg-descr
index edea5e858c46..c7e3b1740eea 100644
--- a/devel/py-packaging/pkg-descr
+++ b/devel/py-packaging/pkg-descr
@@ -1,4 +1,4 @@
packaging provides core utilities for Python packages.
-WWW: https://pypi.python.org/pypi/packaging
+WWW: https://pypi.org/project/packaging/
WWW: https://github.com/pypa/packaging
diff --git a/devel/py-pathlib/pkg-descr b/devel/py-pathlib/pkg-descr
index b1ce95b1a53f..3222800906f6 100644
--- a/devel/py-pathlib/pkg-descr
+++ b/devel/py-pathlib/pkg-descr
@@ -1,4 +1,4 @@
Backport of pathlib from Python 3.4. Offers a set of classes featuring all the
common operations on paths in an easy, object-oriented way.
-WWW: https://pypi.python.org/pypi/pathlib
+WWW: https://pypi.org/project/pathlib/
diff --git a/devel/py-pathlib2/pkg-descr b/devel/py-pathlib2/pkg-descr
index b0e680ef3247..1b1fc8c91764 100644
--- a/devel/py-pathlib2/pkg-descr
+++ b/devel/py-pathlib2/pkg-descr
@@ -2,4 +2,4 @@ Backport of standard pathlib module which tracks the standard library module,
so all the newest features of the standard pathlib can be used also on older
Python versions.
-WWW: https://pypi.python.org/pypi/pathlib2
+WWW: https://pypi.org/project/pathlib2/
diff --git a/devel/py-pep8-naming/pkg-descr b/devel/py-pep8-naming/pkg-descr
index 73e0cfbb4c4d..d8419f621d86 100644
--- a/devel/py-pep8-naming/pkg-descr
+++ b/devel/py-pep8-naming/pkg-descr
@@ -4,4 +4,4 @@ This module provides a plugin for flake8, the Python code checker.
(It replaces the plugin flint-naming for the flint checker.)
-WWW: https://pypi.python.org/pypi/pep8-naming
+WWW: https://pypi.org/project/pep8-naming/
diff --git a/devel/py-period/pkg-descr b/devel/py-period/pkg-descr
index a94b460d36dd..5bb95e1792a7 100644
--- a/devel/py-period/pkg-descr
+++ b/devel/py-period/pkg-descr
@@ -5,4 +5,4 @@ https://www.biostat.wisc.edu/~annis/creations/period.py.html) and ported to
python3 with a few improvements. Period.py was in part inspired by perl's
Time::Period module and the time class mechanism of Cfengine.
-WWW: https://pypi.python.org/pypi/period
+WWW: https://pypi.org/project/period/
diff --git a/devel/py-petname/pkg-descr b/devel/py-petname/pkg-descr
index 3643b4c1ca9b..d3752a5558d1 100644
--- a/devel/py-petname/pkg-descr
+++ b/devel/py-petname/pkg-descr
@@ -2,4 +2,4 @@ This utility will generate "pet names", consisting of a random combination of
an adverb, adjective, and proper name. These are useful for unique hostnames,
for instance.
-WWW: https://pypi.python.org/pypi/petname
+WWW: https://pypi.org/project/petname/
diff --git a/devel/py-pew/pkg-descr b/devel/py-pew/pkg-descr
index 9a9c6bf8e8fa..5d74a5441661 100644
--- a/devel/py-pew/pkg-descr
+++ b/devel/py-pew/pkg-descr
@@ -9,5 +9,5 @@ introducing conflicts in their dependencies.
Pew is completely shell-agnostic and thus works on bash, zsh, fish, powershell,
etc.
-WWW: https://pypi.python.org/pypi/pew
+WWW: https://pypi.org/project/pew/
WWW: https://github.com/berdario/pew
diff --git a/devel/py-phply/pkg-descr b/devel/py-phply/pkg-descr
index 0f14b113bddc..b99250ba21dd 100644
--- a/devel/py-phply/pkg-descr
+++ b/devel/py-phply/pkg-descr
@@ -1,4 +1,4 @@
phply is a parser for the PHP programming language written using PLY,
a Lex/YACC-style parser generator toolkit for Python.
-WWW: https://pypi.python.org/pypi/phply
+WWW: https://pypi.org/project/phply/
diff --git a/devel/py-pid/pkg-descr b/devel/py-pid/pkg-descr
index eb72f7952784..24f4fbd33d74 100644
--- a/devel/py-pid/pkg-descr
+++ b/devel/py-pid/pkg-descr
@@ -1,4 +1,4 @@
Pidfile featuring stale detection and file-locking, can also be used as
context-manager or decorator
-WWW: https://pypi.python.org/pypi/pid
+WWW: https://pypi.org/project/pid/
diff --git a/devel/py-pinocchio/pkg-descr b/devel/py-pinocchio/pkg-descr
index e0731f590f75..742b359d2de1 100644
--- a/devel/py-pinocchio/pkg-descr
+++ b/devel/py-pinocchio/pkg-descr
@@ -6,4 +6,4 @@ on their runtime, doing moderately sophisticated code coverage
analysis of your unit tests, and making your test descriptions look
like specifications.
-WWW: https://pypi.python.org/pypi/pinocchio
+WWW: https://pypi.org/project/pinocchio/
diff --git a/devel/py-pip-tools/pkg-descr b/devel/py-pip-tools/pkg-descr
index cf5565a4fe2e..a2d0aadd7f79 100644
--- a/devel/py-pip-tools/pkg-descr
+++ b/devel/py-pip-tools/pkg-descr
@@ -3,5 +3,5 @@ pip-tools = pip-compile + pip-sync
It is a set of command line tools to help you keep your pip-based packages
fresh, even when you've pinned them.
-WWW: https://pypi.python.org/pypi/pip-tools
+WWW: https://pypi.org/project/pip-tools/
WWW: https://github.com/jazzband/pip-tools
diff --git a/devel/py-pkgconfig/pkg-descr b/devel/py-pkgconfig/pkg-descr
index 624f34a8074f..3ed8f1174acc 100644
--- a/devel/py-pkgconfig/pkg-descr
+++ b/devel/py-pkgconfig/pkg-descr
@@ -1,4 +1,4 @@
pkgconfig is a Python module to interface with the pkg-config command line tool.
-WWW: https://pypi.python.org/pypi/pkgconfig
+WWW: https://pypi.org/project/pkgconfig/
WWW: https://github.com/matze/pkgconfig
diff --git a/devel/py-pluggy/pkg-descr b/devel/py-pluggy/pkg-descr
index 3a1749b34b93..7d1433e28e53 100644
--- a/devel/py-pluggy/pkg-descr
+++ b/devel/py-pluggy/pkg-descr
@@ -1,4 +1,4 @@
This is the plugin manager as used by pytest but stripped of pytest
specific details.
-WWW: https://pypi.python.org/pypi/pluggy
+WWW: https://pypi.org/project/pluggy/
diff --git a/devel/py-prettytable/pkg-descr b/devel/py-prettytable/pkg-descr
index ddbfb950e66a..5348e4651886 100644
--- a/devel/py-prettytable/pkg-descr
+++ b/devel/py-prettytable/pkg-descr
@@ -5,4 +5,4 @@ PrettyTable allows for selection of which columns are to be printed,
independent alignment of columns (left or right justified or centred)
and printing of "sub-tables" by specifying a row range.
-WWW: https://pypi.python.org/pypi/PrettyTable
+WWW: https://pypi.org/project/PrettyTable/
diff --git a/devel/py-prioritized_methods/pkg-descr b/devel/py-prioritized_methods/pkg-descr
index a8f05f4a7413..5290d1273c96 100644
--- a/devel/py-prioritized_methods/pkg-descr
+++ b/devel/py-prioritized_methods/pkg-descr
@@ -18,4 +18,4 @@ functions but want their users to easily override a method without
figuring out how to write a more specific rule or when it is not
feasible.
-WWW: https://pypi.python.org/pypi/prioritized_methods
+WWW: https://pypi.org/project/prioritized_methods/
diff --git a/devel/py-ptvsd/pkg-descr b/devel/py-ptvsd/pkg-descr
index 8128b7c453b4..88e01676c594 100644
--- a/devel/py-ptvsd/pkg-descr
+++ b/devel/py-ptvsd/pkg-descr
@@ -1,3 +1,3 @@
Visual Studio remote debugging server for Python.
-WWW: https://pypi.python.org/pypi/ptvsd
+WWW: https://pypi.org/project/ptvsd/
diff --git a/devel/py-pudb/pkg-descr b/devel/py-pudb/pkg-descr
index 61829b9c7e10..70f3719b17a9 100644
--- a/devel/py-pudb/pkg-descr
+++ b/devel/py-pudb/pkg-descr
@@ -6,4 +6,4 @@ where you write and test it--in a terminal. If you've worked with the excellent
(but nowadays ancient) DOS-based Turbo Pascal or C tools, PuDB's UI might look
familiar.
-WWW: https://pypi.python.org/pypi/pudb
+WWW: https://pypi.org/project/pudb/
diff --git a/devel/py-pycalendar/pkg-descr b/devel/py-pycalendar/pkg-descr
index c11c3821ed74..271c3b111260 100644
--- a/devel/py-pycalendar/pkg-descr
+++ b/devel/py-pycalendar/pkg-descr
@@ -1,4 +1,4 @@
An iCalendar and vCard project for python.
-WWW: https://pypi.python.org/pypi/pycalendar/2.0
+WWW: https://pypi.org/project/pycalendar/2.0/
SVN: http://svn.mulberrymail.com/repos/PyCalendar/branches/server-stable/
diff --git a/devel/py-pycmd/pkg-descr b/devel/py-pycmd/pkg-descr
index ffff9ede1640..bd5f9a0dd1e7 100644
--- a/devel/py-pycmd/pkg-descr
+++ b/devel/py-pycmd/pkg-descr
@@ -6,4 +6,4 @@ development:
* py.countloc: give LOCs for lines and testlines
* py.which: print location of an importable package or module
-WWW: https://pypi.python.org/pypi/pycmd
+WWW: https://pypi.org/project/pycmd/
diff --git a/devel/py-pycodestyle/pkg-descr b/devel/py-pycodestyle/pkg-descr
index cf7f50997a7b..7a0e50d2dbbd 100644
--- a/devel/py-pycodestyle/pkg-descr
+++ b/devel/py-pycodestyle/pkg-descr
@@ -4,5 +4,5 @@ style conventions in PEP 8.
This package used to be called pep8 but was renamed to pycodestyle
to reduce confusion
-WWW: https://pypi.python.org/pypi/pycodestyle
+WWW: https://pypi.org/project/pycodestyle/
WWW: https://pycodestyle.readthedocs.io/en/latest/
diff --git a/devel/py-pydevd/pkg-descr b/devel/py-pydevd/pkg-descr
index baf3488de13a..6f59ff3192ee 100644
--- a/devel/py-pydevd/pkg-descr
+++ b/devel/py-pydevd/pkg-descr
@@ -2,4 +2,4 @@ The sources for the PyDev.Debugger (used in PyDev & PyCharm)
It is available so that it can be installed for doing remote debugging.
-WWW: https://pypi.python.org/pypi/pydevd
+WWW: https://pypi.org/project/pydevd/
diff --git a/devel/py-pydocstyle/pkg-descr b/devel/py-pydocstyle/pkg-descr
index cece16b91f8e..91ce8786505e 100644
--- a/devel/py-pydocstyle/pkg-descr
+++ b/devel/py-pydocstyle/pkg-descr
@@ -10,4 +10,4 @@ not be considered a reference implementation.
pydocstyle supports Python 2.6, 2.7, 3.3, 3.4, 3.5, pypy and pypy3.
-WWW: https://pypi.python.org/pypi/pydocstyle
+WWW: https://pypi.org/project/pydocstyle/
diff --git a/devel/py-pyflakes/pkg-descr b/devel/py-pyflakes/pkg-descr
index 88ca08ba5c58..06b7855afffa 100644
--- a/devel/py-pyflakes/pkg-descr
+++ b/devel/py-pyflakes/pkg-descr
@@ -4,5 +4,5 @@ modules to check them. This is both safer and faster, although it does not
perform as many checks. Unlike PyLint, Pyflakes checks only for logical errors
in programs; it does not perform any checks on style.
-WWW: https://pypi.python.org/pypi/pyflakes
+WWW: https://pypi.org/project/pyflakes/
WWW: https://github.com/PyCQA/pyflakes
diff --git a/devel/py-pygpx/pkg-descr b/devel/py-pygpx/pkg-descr
index 048077d1efac..2c46b08637f8 100644
--- a/devel/py-pygpx/pkg-descr
+++ b/devel/py-pygpx/pkg-descr
@@ -1,4 +1,4 @@
py-gpx is a python module for parsing GPS Exchange Format (GPX) files.
This module allows you to parse and extract data from GPX files.
-WWW: https://pypi.python.org/pypi/pygpx
+WWW: https://pypi.org/project/pygpx/
diff --git a/devel/py-pyicu/pkg-descr b/devel/py-pyicu/pkg-descr
index 5d402cc8885b..2311acddad83 100644
--- a/devel/py-pyicu/pkg-descr
+++ b/devel/py-pyicu/pkg-descr
@@ -1,4 +1,4 @@
PyICU is a python extension wrapping IBM's ICU C++ API.
PyICU is supported on Mac OS X, Linux (32- and 64-bit) and Windows.
-WWW: https://pypi.python.org/pypi/PyICU
+WWW: https://pypi.org/project/PyICU/
diff --git a/devel/py-pyinstaller/pkg-descr b/devel/py-pyinstaller/pkg-descr
index 10e5388b9052..033168654596 100644
--- a/devel/py-pyinstaller/pkg-descr
+++ b/devel/py-pyinstaller/pkg-descr
@@ -11,4 +11,4 @@ out-of-the-box. This means that, with PyInstaller, all the required tricks
to make external packages work are already integrated within PyInstaller
itself so that there is no user intervention required.
-WWW: https://pypi.python.org/pypi/PyInstaller
+WWW: https://pypi.org/project/PyInstaller/
diff --git a/devel/py-pylru-cache/pkg-descr b/devel/py-pylru-cache/pkg-descr
index 668ec7516cc5..80c181682367 100644
--- a/devel/py-pylru-cache/pkg-descr
+++ b/devel/py-pylru-cache/pkg-descr
@@ -1,4 +1,4 @@
LRU cache for python. Provides a dictionary-like object as well
as a method decorator.
-WWW: https://pypi.python.org/pypi/py_lru_cache
+WWW: https://pypi.org/project/py_lru_cache/
diff --git a/devel/py-pymarc/pkg-descr b/devel/py-pymarc/pkg-descr
index a78cc78e531e..2c8f2b7abede 100644
--- a/devel/py-pymarc/pkg-descr
+++ b/devel/py-pymarc/pkg-descr
@@ -1,3 +1,3 @@
pymarc is a python library for working with MARC21 bibliographic data.
-WWW: https://pypi.python.org/pypi/pymarc
+WWW: https://pypi.org/project/pymarc/
diff --git a/devel/py-pyparsing/pkg-descr b/devel/py-pyparsing/pkg-descr
index 27f8f9d3b077..0facdc5a56b4 100644
--- a/devel/py-pyparsing/pkg-descr
+++ b/devel/py-pyparsing/pkg-descr
@@ -3,5 +3,5 @@ directly in the client code using parsing objects, instead of externally, as
with lex/yacc-type tools. Includes simple examples for parsing SQL, CORBA IDL,
and 4-function math.
-WWW: https://pypi.python.org/pypi/pyparsing
+WWW: https://pypi.org/project/pyparsing/
WWW: http://pyparsing.wikispaces.com/
diff --git a/devel/py-pyrfc3339/pkg-descr b/devel/py-pyrfc3339/pkg-descr
index 96c154d3cea6..dd6d246d17fa 100644
--- a/devel/py-pyrfc3339/pkg-descr
+++ b/devel/py-pyrfc3339/pkg-descr
@@ -1,5 +1,5 @@
pyRFC3339 parses and generates RFC 3339-compliant timestamps using Python
datetime.datetime objects.
-WWW: https://pypi.python.org/pypi/pyRFC3339
+WWW: https://pypi.org/project/pyRFC3339/
WWW: https://github.com/kurtraschke/pyRFC3339
diff --git a/devel/py-pytest-asyncio/pkg-descr b/devel/py-pytest-asyncio/pkg-descr
index 7439a0717e0d..19fb8a5dc42a 100644
--- a/devel/py-pytest-asyncio/pkg-descr
+++ b/devel/py-pytest-asyncio/pkg-descr
@@ -2,4 +2,4 @@ asyncio code is usually written in the form of coroutines, which makes it
slightly more difficult to test using normal testing tools. pytest-asyncio
provides useful fixtures and markers to make testing easier.
-WWW: https://pypi.python.org/pypi/pytest-asyncio
+WWW: https://pypi.org/project/pytest-asyncio/
diff --git a/devel/py-pytest-django/pkg-descr b/devel/py-pytest-django/pkg-descr
index 70b39427fb2b..a8ee7df2b08b 100644
--- a/devel/py-pytest-django/pkg-descr
+++ b/devel/py-pytest-django/pkg-descr
@@ -1,4 +1,4 @@
pytest-django allows you to test your Django project/applications with the
pytest testing tool.
-WWW: https://pypi.python.org/pypi/pytest-django
+WWW: https://pypi.org/project/pytest-django/
diff --git a/devel/py-pytest-flake8/pkg-descr b/devel/py-pytest-flake8/pkg-descr
index 12a46d3c80ed..a2d89ca781a8 100644
--- a/devel/py-pytest-flake8/pkg-descr
+++ b/devel/py-pytest-flake8/pkg-descr
@@ -1,4 +1,4 @@
pytest-flake8 is a pytest plugin for efficiently checking PEP8 compliance.
-WWW: https://pypi.python.org/pypi/pytest-flake8
+WWW: https://pypi.org/project/pytest-flake8/
WWW: https://github.com/tholo/pytest-flake8
diff --git a/devel/py-pytest-sugar/pkg-descr b/devel/py-pytest-sugar/pkg-descr
index c6b6cd142459..0f270dfab419 100644
--- a/devel/py-pytest-sugar/pkg-descr
+++ b/devel/py-pytest-sugar/pkg-descr
@@ -1,5 +1,5 @@
pytest-sugar is a plugin for py.test that shows failures and errors instantly
and shows a progress bar.
-WWW: https://pypi.python.org/pypi/pytest-sugar
+WWW: https://pypi.org/project/pytest-sugar/
WWW: https://github.com/Frozenball/pytest-sugar
diff --git a/devel/py-pytest-tornado/pkg-descr b/devel/py-pytest-tornado/pkg-descr
index e3c77c52f456..8b5a896b8413 100644
--- a/devel/py-pytest-tornado/pkg-descr
+++ b/devel/py-pytest-tornado/pkg-descr
@@ -1,4 +1,4 @@
A py.test plugin providing fixtures and markers to simplify testing of
asynchronous tornado applications.
-WWW: https://pypi.python.org/pypi/pytest-tornado
+WWW: https://pypi.org/project/pytest-tornado/
diff --git a/devel/py-python-gist/pkg-descr b/devel/py-python-gist/pkg-descr
index c10f13cbf5f2..637c0c94a307 100644
--- a/devel/py-python-gist/pkg-descr
+++ b/devel/py-python-gist/pkg-descr
@@ -3,4 +3,4 @@ several methods for inspecting a users gists, and the ability to easily
create them.
WWW: https://github.com/jdowner/gist
-WWW: https://pypi.python.org/pypi/python-gist
+WWW: https://pypi.org/project/python-gist/
diff --git a/devel/py-pytools/pkg-descr b/devel/py-pytools/pkg-descr
index 78cc954cc712..da5a1be36007 100644
--- a/devel/py-pytools/pkg-descr
+++ b/devel/py-pytools/pkg-descr
@@ -11,4 +11,4 @@ curious nonetheless, here's what's on offer:
- Batch job submission, pytools.batchjob.
- A lexer, pytools.lex.
-WWW: https://pypi.python.org/pypi/pytools
+WWW: https://pypi.org/project/pytools/
diff --git a/devel/py-pyutil/pkg-descr b/devel/py-pyutil/pkg-descr
index 390c5450a0ed..efcce1c883e5 100644
--- a/devel/py-pyutil/pkg-descr
+++ b/devel/py-pyutil/pkg-descr
@@ -7,4 +7,4 @@ been obsoleted by new features added to the Python
language or its standard library, thus showing that
we're not alone in wanting tools like these.
-WWW: https://pypi.python.org/pypi/pyutil
+WWW: https://pypi.org/project/pyutil/
diff --git a/devel/py-pyvalid/pkg-descr b/devel/py-pyvalid/pkg-descr
index 30c88b82a5b6..9db98ace31eb 100644
--- a/devel/py-pyvalid/pkg-descr
+++ b/devel/py-pyvalid/pkg-descr
@@ -1,4 +1,4 @@
pyvalid is a Python validation tool for checking of input function
parameters and return values.
-WWW: https://pypi.python.org/pypi/pyvalid
+WWW: https://pypi.org/project/pyvalid/
diff --git a/devel/py-pyvisa-py/pkg-descr b/devel/py-pyvisa-py/pkg-descr
index 5695e8fdb571..4709eb9cd8e6 100644
--- a/devel/py-pyvisa-py/pkg-descr
+++ b/devel/py-pyvisa-py/pkg-descr
@@ -9,5 +9,5 @@ implements most of the methods for Message Based communication
(Serial/USB/GPIB/Ethernet) using Python and some well developed, easy to deploy
and cross platform libraries.
-WWW: https://pypi.python.org/pypi/PyVISA-py
+WWW: https://pypi.org/project/PyVISA-py/
WWW: https://github.com/pyvisa/pyvisa-py
diff --git a/devel/py-pyvisa/pkg-descr b/devel/py-pyvisa/pkg-descr
index d0fe1bc3aaa4..b2a5396566a5 100644
--- a/devel/py-pyvisa/pkg-descr
+++ b/devel/py-pyvisa/pkg-descr
@@ -2,5 +2,5 @@ A Python package for support of the "Virtual Instrument Software Architecture"
(VISA), in order to control measurement devices and test equipment via GPIB,
RS232, Ethernet or USB.
-WWW: https://pypi.python.org/pypi/PyVISA
+WWW: https://pypi.org/project/PyVISA/
WWW: https://github.com/pyvisa/pyvisa
diff --git a/devel/py-pyxml2obj/pkg-descr b/devel/py-pyxml2obj/pkg-descr
index ebc6aefa0c35..4eecaeb4be0a 100644
--- a/devel/py-pyxml2obj/pkg-descr
+++ b/devel/py-pyxml2obj/pkg-descr
@@ -4,4 +4,4 @@ to python object, and XMLout python object to xml.
This module is inspired by XML::Simple in CPAN, but some options of
XML::Simple are not supported.
-WWW: https://pypi.python.org/pypi/pyxml2obj
+WWW: https://pypi.org/project/pyxml2obj/
diff --git a/devel/py-raven/pkg-descr b/devel/py-raven/pkg-descr
index 2583e4a5cac2..18f7f4f706c9 100644
--- a/devel/py-raven/pkg-descr
+++ b/devel/py-raven/pkg-descr
@@ -4,4 +4,4 @@ It provides full out-of-the-box support for many of the popular
frameworks, including Django, Flask, and Pylons. Raven also includes
drop-in support for any WSGI-compatible web application.
-WWW: https://pypi.python.org/pypi/raven
+WWW: https://pypi.org/project/raven/
diff --git a/devel/py-repoze.what-pylons/pkg-descr b/devel/py-repoze.what-pylons/pkg-descr
index 2cd4202d103d..21a7a4ad77d4 100644
--- a/devel/py-repoze.what-pylons/pkg-descr
+++ b/devel/py-repoze.what-pylons/pkg-descr
@@ -11,4 +11,4 @@ with code samples.
never decrease -- if it ever does, report it as a bug!
* TurboGears 2 is officially supported as well.
-WWW: https://pypi.python.org/pypi/repoze.what-pylons
+WWW: https://pypi.org/project/repoze.what-pylons/
diff --git a/devel/py-repoze.xmliter/pkg-descr b/devel/py-repoze.xmliter/pkg-descr
index cd644f4000f3..36467e64e42c 100644
--- a/devel/py-repoze.xmliter/pkg-descr
+++ b/devel/py-repoze.xmliter/pkg-descr
@@ -2,4 +2,4 @@ This package provides a wrapper for lxml trees which serializes
to string on iteration, but otherwise makes the tree available
in an attribute.
-WWW: https://pypi.python.org/pypi/repoze.xmliter
+WWW: https://pypi.org/project/repoze.xmliter/
diff --git a/devel/py-requestsexceptions/pkg-descr b/devel/py-requestsexceptions/pkg-descr
index 7841bae02d98..11389e79beb3 100644
--- a/devel/py-requestsexceptions/pkg-descr
+++ b/devel/py-requestsexceptions/pkg-descr
@@ -1,3 +1,3 @@
Import exceptions from potentially bundled packages in requests.
-WWW: https://pypi.python.org/pypi/requestsexceptions
+WWW: https://pypi.org/project/requestsexceptions/
diff --git a/devel/py-rlcompleter2/pkg-descr b/devel/py-rlcompleter2/pkg-descr
index be4e891cfdf5..e7a933713521 100644
--- a/devel/py-rlcompleter2/pkg-descr
+++ b/devel/py-rlcompleter2/pkg-descr
@@ -4,4 +4,4 @@ rlcompleter2 is an interactive readline completion handler, featuring:
* convenient completions on module, instance and function objects
* ultra simple user interface: <tab> (try hit it multiple times!)
-WWW: https://pypi.python.org/pypi/rlcompleter2
+WWW: https://pypi.org/project/rlcompleter2/
diff --git a/devel/py-rply/pkg-descr b/devel/py-rply/pkg-descr
index 0aa7e3def69a..9a05172ce84e 100644
--- a/devel/py-rply/pkg-descr
+++ b/devel/py-rply/pkg-descr
@@ -2,4 +2,4 @@ rply is a pure python parser generator, that also works with RPython. It is a
more-or-less direct port of David Beazley's awesome PLY, with a new public
API, and RPython support.
-WWW: https://pypi.python.org/pypi/rply
+WWW: https://pypi.org/project/rply/
diff --git a/devel/py-rtslib-fb/pkg-descr b/devel/py-rtslib-fb/pkg-descr
index beff3be157da..591ab64bd779 100644
--- a/devel/py-rtslib-fb/pkg-descr
+++ b/devel/py-rtslib-fb/pkg-descr
@@ -1,3 +1,3 @@
API for Linux kernel SCSI target (aka LIO)
-WWW: https://pypi.python.org/pypi/rtslib-fb
+WWW: https://pypi.org/project/rtslib-fb/
diff --git a/devel/py-rubymarshal/pkg-descr b/devel/py-rubymarshal/pkg-descr
index 31dc8796149c..364c586d01a4 100644
--- a/devel/py-rubymarshal/pkg-descr
+++ b/devel/py-rubymarshal/pkg-descr
@@ -10,4 +10,4 @@ Only basics Ruby data types can be read and written:
* `hash` (mapped to `dict`),
* symbols and other classes are mapped to specific Python classes.
-WWW: https://pypi.python.org/pypi/rubymarshal
+WWW: https://pypi.org/project/rubymarshal/
diff --git a/devel/py-rwt/pkg-descr b/devel/py-rwt/pkg-descr
index c02f6dfe1c0d..dd8a5a1200a8 100644
--- a/devel/py-rwt/pkg-descr
+++ b/devel/py-rwt/pkg-descr
@@ -10,5 +10,5 @@ RWT (Run With This) provides on-demand dependency resolution.
- Re-uses the pip tool chain for package installation and pkg_resources for
working set management.
-WWW: https://pypi.python.org/pypi/rwt
+WWW: https://pypi.org/project/rwt/
WWW: https://github.com/jaraco/rwt
diff --git a/devel/py-selection/pkg-descr b/devel/py-selection/pkg-descr
index 7648b76b54bd..a77c4710ee27 100644
--- a/devel/py-selection/pkg-descr
+++ b/devel/py-selection/pkg-descr
@@ -1,3 +1,3 @@
API to extract data from HTML and XML documents.
-WWW: https://pypi.python.org/pypi/selection
+WWW: https://pypi.org/project/selection/
diff --git a/devel/py-selectors34/pkg-descr b/devel/py-selectors34/pkg-descr
index e2f4831965e0..ef1e2c14cfdd 100644
--- a/devel/py-selectors34/pkg-descr
+++ b/devel/py-selectors34/pkg-descr
@@ -2,4 +2,4 @@ selectors34 is a backport of the selectors module from Python 3.4. The selectors
module written by Charles-François Natali. This port is based on Victor
Stinner’s trollius/selectors.py port.
-WWW: https://pypi.python.org/pypi/selectors34
+WWW: https://pypi.org/project/selectors34/
diff --git a/devel/py-serpent/pkg-descr b/devel/py-serpent/pkg-descr
index e8e041967f43..19c33f2c8f6f 100644
--- a/devel/py-serpent/pkg-descr
+++ b/devel/py-serpent/pkg-descr
@@ -4,4 +4,4 @@ Because it only serializes literals and recreates the objects using
ast.literal_eval(), the serialized data is safe to transport to other
machines (over the network for instance) and de-serialize it there.
-WWW: https://pypi.python.org/pypi/serpent
+WWW: https://pypi.org/project/serpent/
diff --git a/devel/py-setproctitle/pkg-descr b/devel/py-setproctitle/pkg-descr
index 93095aca25a7..d4bbc1b6a83d 100644
--- a/devel/py-setproctitle/pkg-descr
+++ b/devel/py-setproctitle/pkg-descr
@@ -3,5 +3,5 @@ A setproctitle implementation for Python.
The library allows a process to change its title (as displayed by system tools
such as ps(1) and top(1).
-WWW: https://pypi.python.org/pypi/setproctitle
+WWW: https://pypi.org/project/setproctitle/
WWW: https://github.com/dvarrazzo/py-setproctitle
diff --git a/devel/py-setuptools-git/pkg-descr b/devel/py-setuptools-git/pkg-descr
index ca5201dbbfcf..26910ec62a55 100644
--- a/devel/py-setuptools-git/pkg-descr
+++ b/devel/py-setuptools-git/pkg-descr
@@ -1,3 +1,3 @@
Setuptools revision control system plugin for Git.
-WWW: https://pypi.python.org/pypi/setuptools-git
+WWW: https://pypi.org/project/setuptools-git/
diff --git a/devel/py-setuptools/pkg-descr b/devel/py-setuptools/pkg-descr
index d7b599c66f2e..abcbbd10ceab 100644
--- a/devel/py-setuptools/pkg-descr
+++ b/devel/py-setuptools/pkg-descr
@@ -7,4 +7,4 @@ designed to facilitate packaging Python projects, where packaging includes:
- Platform-specific details
- Python 3 support
-WWW: https://pypi.python.org/pypi/setuptools
+WWW: https://pypi.org/project/setuptools/
diff --git a/devel/py-setuptools_darcs/pkg-descr b/devel/py-setuptools_darcs/pkg-descr
index 0e7acc8f14b7..79176807d8c1 100644
--- a/devel/py-setuptools_darcs/pkg-descr
+++ b/devel/py-setuptools_darcs/pkg-descr
@@ -1,3 +1,3 @@
setuptools plugin for darcs.
-WWW: https://pypi.python.org/pypi/setuptools_darcs
+WWW: https://pypi.org/project/setuptools_darcs/
diff --git a/devel/py-setuptools_hg/pkg-descr b/devel/py-setuptools_hg/pkg-descr
index 8d6544c583f4..017c2538a757 100644
--- a/devel/py-setuptools_hg/pkg-descr
+++ b/devel/py-setuptools_hg/pkg-descr
@@ -1,3 +1,3 @@
setuptools plugin for Mercurial version control system.
-WWW: https://pypi.python.org/pypi/setuptools_hg
+WWW: https://pypi.org/project/setuptools_hg/
diff --git a/devel/py-shapely/pkg-descr b/devel/py-shapely/pkg-descr
index f99ad1091d72..51ce20da80c8 100644
--- a/devel/py-shapely/pkg-descr
+++ b/devel/py-shapely/pkg-descr
@@ -4,4 +4,4 @@ is not concerned with data formats or coordinate reference systems.
Responsibility for reading and writing data and projecting coordinates
is left to other packages like WorldMill and pyproj.
-WWW: https://pypi.python.org/pypi/Shapely
+WWW: https://pypi.org/project/Shapely/
diff --git a/devel/py-should_dsl/pkg-descr b/devel/py-should_dsl/pkg-descr
index be5c57423381..47d04a77cf8c 100644
--- a/devel/py-should_dsl/pkg-descr
+++ b/devel/py-should_dsl/pkg-descr
@@ -1,3 +1,3 @@
Should assertions in Python as clear and readable as possible
-WWW: https://pypi.python.org/pypi/should_dsl
+WWW: https://pypi.org/project/should_dsl/
diff --git a/devel/py-simplegeneric/pkg-descr b/devel/py-simplegeneric/pkg-descr
index eb29b17f6dbd..8649feae86cd 100644
--- a/devel/py-simplegeneric/pkg-descr
+++ b/devel/py-simplegeneric/pkg-descr
@@ -4,4 +4,4 @@ on. However, instead of using specially-named methods, these generic functions
use simple lookup tables, akin to those used by e.g. pickle.dump() and other
generic functions found in the Python standard library.
-WWW: https://pypi.python.org/pypi/simplegeneric
+WWW: https://pypi.org/project/simplegeneric/
diff --git a/devel/py-simplejson/pkg-descr b/devel/py-simplejson/pkg-descr
index 7f77b2fb1eeb..11422e4e0ca7 100644
--- a/devel/py-simplejson/pkg-descr
+++ b/devel/py-simplejson/pkg-descr
@@ -12,4 +12,4 @@ pickle).
The decoder can handle incoming JSON strings of any specified encoding (UTF-8 by
default).
-WWW: https://pypi.python.org/pypi/simplejson
+WWW: https://pypi.org/project/simplejson/
diff --git a/devel/py-singledispatch/pkg-descr b/devel/py-singledispatch/pkg-descr
index a64bc682c7e9..949aaea97e88 100644
--- a/devel/py-singledispatch/pkg-descr
+++ b/devel/py-singledispatch/pkg-descr
@@ -7,4 +7,4 @@ programming known as single-dispatch generic functions.
This library is a backport of this functionality to Python 2.6 - 3.3.
-WWW: https://pypi.python.org/pypi/singledispatch
+WWW: https://pypi.org/project/singledispatch/
diff --git a/devel/py-six/pkg-descr b/devel/py-six/pkg-descr
index 13d0b99589bb..310a3a836420 100644
--- a/devel/py-six/pkg-descr
+++ b/devel/py-six/pkg-descr
@@ -3,4 +3,4 @@ functions for smoothing over the differences between the Python versions
with the goal of writing Python code that is compatible on both Python
versions. See the documentation for more information on what is provided.
-WWW: https://pypi.python.org/pypi/six
+WWW: https://pypi.org/project/six/
diff --git a/devel/py-smmap2/pkg-descr b/devel/py-smmap2/pkg-descr
index 8cd7aa22ad2f..b99bb94a65b5 100644
--- a/devel/py-smmap2/pkg-descr
+++ b/devel/py-smmap2/pkg-descr
@@ -8,5 +8,5 @@ of the file to be mapped. Once the user reads beyond the mapped region, smmap
will automatically map the next required region, unloading unused regions using
a LRU algorithm.
-WWW: https://pypi.python.org/pypi/smmap2
+WWW: https://pypi.org/project/smmap2/
WWW: https://github.com/gitpython-developers/smmap
diff --git a/devel/py-sourcemap/pkg-descr b/devel/py-sourcemap/pkg-descr
index 00ad933ec4ae..d27a3ccc69b7 100644
--- a/devel/py-sourcemap/pkg-descr
+++ b/devel/py-sourcemap/pkg-descr
@@ -1,3 +1,3 @@
Parse JavaScript source maps.
-WWW: https://pypi.python.org/pypi/sourcemap
+WWW: https://pypi.org/project/sourcemap/
diff --git a/devel/py-speaklater/pkg-descr b/devel/py-speaklater/pkg-descr
index b3e00690dccd..c6230b0d2d0d 100644
--- a/devel/py-speaklater/pkg-descr
+++ b/devel/py-speaklater/pkg-descr
@@ -1,3 +1,3 @@
Speaklater is a Python module that provides lazy strings for translations.
-WWW: https://pypi.python.org/pypi/speaklater
+WWW: https://pypi.org/project/speaklater/
diff --git a/devel/py-statsd/pkg-descr b/devel/py-statsd/pkg-descr
index c1cce4cdd9ff..fdf9b7edcae6 100644
--- a/devel/py-statsd/pkg-descr
+++ b/devel/py-statsd/pkg-descr
@@ -1,4 +1,4 @@
statsd is a friendly front-end to Graphite. This is a Python client for the
statsd daemon.
-WWW: https://pypi.python.org/pypi/statsd
+WWW: https://pypi.org/project/statsd/
diff --git a/devel/py-stdnum/pkg-descr b/devel/py-stdnum/pkg-descr
index f370fa0d6ce9..84e04a5f33e1 100644
--- a/devel/py-stdnum/pkg-descr
+++ b/devel/py-stdnum/pkg-descr
@@ -3,4 +3,4 @@ Python module to parse, validate and reformat standard numbers and codes.
This library offers functions for parsing, validating and reformatting
standard numbers and codes in various formats.
-WWW: https://pypi.python.org/pypi/python-stdnum
+WWW: https://pypi.org/project/python-stdnum/
diff --git a/devel/py-stopit/pkg-descr b/devel/py-stopit/pkg-descr
index c2741e022892..c0c6eda5f370 100644
--- a/devel/py-stopit/pkg-descr
+++ b/devel/py-stopit/pkg-descr
@@ -1,4 +1,4 @@
Raise asynchronous exceptions in other threads, control the timeout
of blocks or callables with two context managers and two decorators.
-WWW: https://pypi.python.org/pypi/stopit
+WWW: https://pypi.org/project/stopit/
diff --git a/devel/py-tapi/pkg-descr b/devel/py-tapi/pkg-descr
index 0e1e7e6d863a..21d83e56b4b9 100644
--- a/devel/py-tapi/pkg-descr
+++ b/devel/py-tapi/pkg-descr
@@ -13,5 +13,5 @@ Features:
- Execute arbitrary python scripts to verify response from endpoint is valid
- Tests your APIs using your own APIs
-WWW: https://pypi.python.org/pypi/Tapi
+WWW: https://pypi.org/project/Tapi/
WWW: https://github.com/jimmyislive/tapi
diff --git a/devel/py-tarantool-queue/pkg-descr b/devel/py-tarantool-queue/pkg-descr
index 318e13e69b70..37fa985093b5 100644
--- a/devel/py-tarantool-queue/pkg-descr
+++ b/devel/py-tarantool-queue/pkg-descr
@@ -1,4 +1,4 @@
Python Bindings for Tarantool Queue (https://github.com/tarantool/queue/)
-WWW: https://pypi.python.org/pypi/tarantool-queue
+WWW: https://pypi.org/project/tarantool-queue/
WWW: https://github.com/tarantool/queue-python
diff --git a/devel/py-tblib/pkg-descr b/devel/py-tblib/pkg-descr
index 19501d328681..5e83b966f3bc 100644
--- a/devel/py-tblib/pkg-descr
+++ b/devel/py-tblib/pkg-descr
@@ -4,4 +4,4 @@ code over multiple processes (imagine multiprocessing, billiard,
futures, celery etc).
Parse traceback strings and raise with the parsed tracebacks.
-WWW: https://pypi.python.org/pypi/tblib
+WWW: https://pypi.org/project/tblib/
diff --git a/devel/py-tempora/pkg-descr b/devel/py-tempora/pkg-descr
index 9e235ede2835..642b296154ab 100644
--- a/devel/py-tempora/pkg-descr
+++ b/devel/py-tempora/pkg-descr
@@ -1,4 +1,4 @@
Tempora is a objects and routines pertaining to date and time.
-WWW: https://pypi.python.org/pypi/tempora
+WWW: https://pypi.org/project/tempora/
WWW: https://github.com/jaraco/tempora
diff --git a/devel/py-tempstorage/pkg-descr b/devel/py-tempstorage/pkg-descr
index b7e87cc07fec..f0455f061dea 100644
--- a/devel/py-tempstorage/pkg-descr
+++ b/devel/py-tempstorage/pkg-descr
@@ -4,4 +4,4 @@ not be packed to get rid of non-cyclic garbage and it does
rudimentary conflict resolution. This is a ripoff of Jim's Packless
bsddb3 storage.
-WWW: https://pypi.python.org/pypi/tempstorage
+WWW: https://pypi.org/project/tempstorage/
diff --git a/devel/py-tenacity/pkg-descr b/devel/py-tenacity/pkg-descr
index 99eb8f19f746..8396d6641a4f 100644
--- a/devel/py-tenacity/pkg-descr
+++ b/devel/py-tenacity/pkg-descr
@@ -2,4 +2,4 @@ Tenacity is an Apache 2.0 licensed general-purpose retrying library, written
in Python, to simplify the task of adding retry behavior to just about
anything. It originates from a fork of Retrying.
-WWW: https://pypi.python.org/pypi/tenacity
+WWW: https://pypi.org/project/tenacity/
diff --git a/devel/py-termcolor/pkg-descr b/devel/py-termcolor/pkg-descr
index 3d0e623f069f..2ab367e6fbcf 100644
--- a/devel/py-termcolor/pkg-descr
+++ b/devel/py-termcolor/pkg-descr
@@ -1,3 +1,3 @@
ANSII Color formatting for output in terminal.
-WWW: https://pypi.python.org/pypi/termcolor
+WWW: https://pypi.org/project/termcolor/
diff --git a/devel/py-testresources/pkg-descr b/devel/py-testresources/pkg-descr
index daa02bdbb236..2b6487a74cd2 100644
--- a/devel/py-testresources/pkg-descr
+++ b/devel/py-testresources/pkg-descr
@@ -3,4 +3,4 @@ optimisation where expensive common resources are needed for test cases - for
example sample working trees for VCS systems, reference databases for enterprise
applications, or web servers ... let imagination run wild.
-WWW: https://pypi.python.org/pypi/testresources
+WWW: https://pypi.org/project/testresources/
diff --git a/devel/py-testscenarios/pkg-descr b/devel/py-testscenarios/pkg-descr
index cc32b3399685..c489e77ac919 100644
--- a/devel/py-testscenarios/pkg-descr
+++ b/devel/py-testscenarios/pkg-descr
@@ -4,4 +4,4 @@ a single test suite) or for classic dependency injection (provide tests with
dependencies externally to the test code itself, allowing easy testing in
different situations).
-WWW: https://pypi.python.org/pypi/testscenarios
+WWW: https://pypi.org/project/testscenarios/
diff --git a/devel/py-testtools/pkg-descr b/devel/py-testtools/pkg-descr
index 2164e23edc5c..cea7453309b6 100644
--- a/devel/py-testtools/pkg-descr
+++ b/devel/py-testtools/pkg-descr
@@ -2,5 +2,5 @@ testtools is a set of extensions to the Python standard library's unit testing
framework. These extensions have been derived from years of experience with unit
testing in Python and come from many different sources.
-WWW: https://pypi.python.org/pypi/testtools
+WWW: https://pypi.org/project/testtools/
WWW: https://github.com/testing-cabal/testtools
diff --git a/devel/py-timelib/pkg-descr b/devel/py-timelib/pkg-descr
index 43ef4c9a6b2c..133c0e9aa602 100644
--- a/devel/py-timelib/pkg-descr
+++ b/devel/py-timelib/pkg-descr
@@ -1,4 +1,4 @@
timelib is a short wrapper around php's internal timelib module.
It currently only provides a few functions.
-WWW: https://pypi.python.org/pypi/timelib
+WWW: https://pypi.org/project/timelib/
diff --git a/devel/py-tipper/pkg-descr b/devel/py-tipper/pkg-descr
index b836484a1b7d..e3f4894e46df 100644
--- a/devel/py-tipper/pkg-descr
+++ b/devel/py-tipper/pkg-descr
@@ -6,5 +6,5 @@ for `SIGUSR1`_. Running ``kill -SIGUSR1 [pid]`` will cause the process
to dump the current stack trace of each thread to
``$TMPDIR/tipper-[Unix timestamp]-[parent pid]-[pid].log``.
-WWW: https://pypi.python.org/pypi/tipper
+WWW: https://pypi.org/project/tipper/
diff --git a/devel/py-tooz/pkg-descr b/devel/py-tooz/pkg-descr
index 9a43ddd5f4a0..bd88ff176531 100644
--- a/devel/py-tooz/pkg-descr
+++ b/devel/py-tooz/pkg-descr
@@ -2,4 +2,4 @@ The Tooz project aims at centralizing the most common distributed primitives
like group membership protocol, lock service and leader election by providing
a coordination API helping developers to build distributed applications.
-WWW: https://pypi.python.org/pypi/tooz
+WWW: https://pypi.org/project/tooz/
diff --git a/devel/py-trace2html/pkg-descr b/devel/py-trace2html/pkg-descr
index db0b406dfa14..69351ee2bbe1 100644
--- a/devel/py-trace2html/pkg-descr
+++ b/devel/py-trace2html/pkg-descr
@@ -2,4 +2,4 @@
with the `trace' module of the standard python library into a set of human
readable HTML documents showing sortable summary and annotated source files.
-WWW: https://pypi.python.org/pypi/trace2html
+WWW: https://pypi.org/project/trace2html/
diff --git a/devel/py-traceback2/pkg-descr b/devel/py-traceback2/pkg-descr
index e7bf195ae2a9..15cb3c2b7cc1 100644
--- a/devel/py-traceback2/pkg-descr
+++ b/devel/py-traceback2/pkg-descr
@@ -1,3 +1,3 @@
A backport of traceback to older supported Pythons.
-WWW: https://pypi.python.org/pypi/traceback2
+WWW: https://pypi.org/project/traceback2/
diff --git a/devel/py-traitlets/pkg-descr b/devel/py-traitlets/pkg-descr
index c15094efd870..83288982b13b 100644
--- a/devel/py-traitlets/pkg-descr
+++ b/devel/py-traitlets/pkg-descr
@@ -2,4 +2,4 @@ Traitlets is a framework that lets Python classes have attributes with type
checking, dynamically calculated default values, and 'on change' callbacks.
Keeps configuration in a variety of formats, including JSON.
-WWW: https://pypi.python.org/pypi/traitlets
+WWW: https://pypi.org/project/traitlets/
diff --git a/devel/py-traits/pkg-descr b/devel/py-traits/pkg-descr
index d427af61342e..d93b86f597be 100644
--- a/devel/py-traits/pkg-descr
+++ b/devel/py-traits/pkg-descr
@@ -14,4 +14,4 @@ of trait attributes within the class. Trait attributes defined by
a classs are automatically inherited by any subclass derived from
the class.
-WWW: https://pypi.python.org/pypi/traits
+WWW: https://pypi.org/project/traits/
diff --git a/devel/py-transaction/pkg-descr b/devel/py-transaction/pkg-descr
index fcb5e59da14b..b025e9fa5d9f 100644
--- a/devel/py-transaction/pkg-descr
+++ b/devel/py-transaction/pkg-descr
@@ -1,4 +1,4 @@
py-transaction contains a generic transaction implementation
for Python. It is mainly used by the ZODB, though.
-WWW: https://pypi.python.org/pypi/transaction
+WWW: https://pypi.org/project/transaction/
diff --git a/devel/py-twine/pkg-descr b/devel/py-twine/pkg-descr
index cce37fe63c60..d06780cb3b1a 100644
--- a/devel/py-twine/pkg-descr
+++ b/devel/py-twine/pkg-descr
@@ -1,3 +1,3 @@
Twine is a utility for interacting with PyPI.
-WWW: https://pypi.python.org/pypi/twine
+WWW: https://pypi.org/project/twine/
diff --git a/devel/py-typing/pkg-descr b/devel/py-typing/pkg-descr
index eda3df1f97ed..bd205715df0f 100644
--- a/devel/py-typing/pkg-descr
+++ b/devel/py-typing/pkg-descr
@@ -5,4 +5,4 @@ annotations. The notation can be used for documenting code in a concise,
standard format, and it has been designed to also be used by static and
runtime type checkers, static analyzers, IDEs and other tools.
-WWW: https://pypi.python.org/pypi/typing
+WWW: https://pypi.org/project/typing/
diff --git a/devel/py-tzlocal/pkg-descr b/devel/py-tzlocal/pkg-descr
index b0952f8c1d4f..fe4f4ae43da3 100644
--- a/devel/py-tzlocal/pkg-descr
+++ b/devel/py-tzlocal/pkg-descr
@@ -7,4 +7,4 @@ to get the local timezone information, unless you know the zoneinfo
name, and under several Linux distros that's hard or impossible to
figure out.
-WWW: https://pypi.python.org/pypi/tzlocal
+WWW: https://pypi.org/project/tzlocal/
diff --git a/devel/py-unittest2/pkg-descr b/devel/py-unittest2/pkg-descr
index 58263379018b..ec7294ea1cc6 100644
--- a/devel/py-unittest2/pkg-descr
+++ b/devel/py-unittest2/pkg-descr
@@ -2,4 +2,4 @@ unittest2 is a backport of the new features added to the
unittest testing framework in Python 2.7. It is tested to
on Python 2.4 - 2.7.
-WWW: https://pypi.python.org/pypi/unittest2
+WWW: https://pypi.org/project/unittest2/
diff --git a/devel/py-validators/pkg-descr b/devel/py-validators/pkg-descr
index 58abd91bb11f..6211b5bea726 100644
--- a/devel/py-validators/pkg-descr
+++ b/devel/py-validators/pkg-descr
@@ -7,4 +7,4 @@ validating a simple value does not require defining a form or a schema.
>>> validators.email('someone@example.com')
True
-WWW: https://pypi.python.org/pypi/validators
+WWW: https://pypi.org/project/validators/
diff --git a/devel/py-validictory/pkg-descr b/devel/py-validictory/pkg-descr
index 7d525247c284..b21683ca658f 100644
--- a/devel/py-validictory/pkg-descr
+++ b/devel/py-validictory/pkg-descr
@@ -3,4 +3,4 @@ Validictory is a general purpose Python data validator.
It works with Python 2.7 and Python 3.3+ and uses a Schema format
based on JSON Schema Proposal (http://json-schema.org).
-WWW: https://pypi.python.org/pypi/validictory
+WWW: https://pypi.org/project/validictory/
diff --git a/devel/py-venusian/pkg-descr b/devel/py-venusian/pkg-descr
index 3900739bcff4..93da9e97b66e 100644
--- a/devel/py-venusian/pkg-descr
+++ b/devel/py-venusian/pkg-descr
@@ -3,4 +3,4 @@ actions. Instead of taking actions when a function (or class) decorator
is executed at import time, you can defer the action usually taken by
the decorator until a separate "scan" phase.
-WWW: https://pypi.python.org/pypi/venusian
+WWW: https://pypi.org/project/venusian/
diff --git a/devel/py-versiontools/pkg-descr b/devel/py-versiontools/pkg-descr
index 05f612e9d1ad..841c1a20b37e 100644
--- a/devel/py-versiontools/pkg-descr
+++ b/devel/py-versiontools/pkg-descr
@@ -1,3 +1,3 @@
Smart replacement for plain tuple used in __version__.
-WWW: https://pypi.python.org/pypi/versiontools
+WWW: https://pypi.org/project/versiontools/
diff --git a/devel/py-warlock/pkg-descr b/devel/py-warlock/pkg-descr
index e19470281111..b07f6e5a5e27 100644
--- a/devel/py-warlock/pkg-descr
+++ b/devel/py-warlock/pkg-descr
@@ -1,3 +1,3 @@
Python object model built on JSON schema and JSON patch.
-WWW: https://pypi.python.org/pypi/warlock
+WWW: https://pypi.org/project/warlock/
diff --git a/devel/py-weblib/pkg-descr b/devel/py-weblib/pkg-descr
index 74d209dc1eb5..e7b3d7e929de 100644
--- a/devel/py-weblib/pkg-descr
+++ b/devel/py-weblib/pkg-descr
@@ -11,4 +11,4 @@ Weblib provides tools to solve typical tasks in web scraping:
* cross-platform file locking
* operations with files and directories
-WWW: https://pypi.python.org/pypi/weblib
+WWW: https://pypi.org/project/weblib/
diff --git a/devel/py-websockify/pkg-descr b/devel/py-websockify/pkg-descr
index 8b23dd86a7d2..9048ab309111 100644
--- a/devel/py-websockify/pkg-descr
+++ b/devel/py-websockify/pkg-descr
@@ -5,4 +5,4 @@ to normal socket traffic. Websockify accepts the WebSockets handshake,
parses it, and then begins forwarding traffic between the client and
the target in both directions.
-WWW: https://pypi.python.org/pypi/websockify
+WWW: https://pypi.org/project/websockify/
diff --git a/devel/py-wrapt/pkg-descr b/devel/py-wrapt/pkg-descr
index 2a1ab2a54d40..df779504ecb1 100644
--- a/devel/py-wrapt/pkg-descr
+++ b/devel/py-wrapt/pkg-descr
@@ -8,4 +8,4 @@ introspectability, signatures, type checking abilities etc. The decorators that
can be constructed using this module will work in far more scenarios than
typical decorators and provide more predictable and consistent behaviour.
-WWW: https://pypi.python.org/pypi/wrapt
+WWW: https://pypi.org/project/wrapt/
diff --git a/devel/py-wsgi_intercept/pkg-descr b/devel/py-wsgi_intercept/pkg-descr
index b781cfc6d556..4e1678057beb 100644
--- a/devel/py-wsgi_intercept/pkg-descr
+++ b/devel/py-wsgi_intercept/pkg-descr
@@ -1,3 +1,3 @@
wsgi_intercept installs a WSGI application in place of a real URI for testing.
-WWW: https://pypi.python.org/pypi/wsgi_intercept
+WWW: https://pypi.org/project/wsgi_intercept/
diff --git a/devel/py-wsme/pkg-descr b/devel/py-wsme/pkg-descr
index d184b0b252a6..94fc092951cc 100644
--- a/devel/py-wsme/pkg-descr
+++ b/devel/py-wsme/pkg-descr
@@ -5,4 +5,4 @@ your favorite Python web (micro)framework, so you can use both your preferred
way of routing your REST requests and most of the features of WSME that rely
on the typing system.
-WWW: https://pypi.python.org/pypi/WSME
+WWW: https://pypi.org/project/WSME/
diff --git a/devel/py-xdis/pkg-descr b/devel/py-xdis/pkg-descr
index 6dc2ebfcae64..abebd16c1b8c 100644
--- a/devel/py-xdis/pkg-descr
+++ b/devel/py-xdis/pkg-descr
@@ -21,4 +21,4 @@ optimizer this package may also be useful. In addition to the kinds of
instruction categorization that dis offers, we have additional categories for
things that would be useful in such a bytecode optimizer.
-WWW: https://pypi.python.org/pypi/xdis
+WWW: https://pypi.org/project/xdis/
diff --git a/devel/py-xmltodict/pkg-descr b/devel/py-xmltodict/pkg-descr
index 1e02bbfe82d1..75d04683f3f9 100644
--- a/devel/py-xmltodict/pkg-descr
+++ b/devel/py-xmltodict/pkg-descr
@@ -1,5 +1,5 @@
xmltodict is a Python module that makes working with XML feel like you are
working with JSON.
-WWW: https://pypi.python.org/pypi/xmltodict
+WWW: https://pypi.org/project/xmltodict/
WWW: https://github.com/martinblech/xmltodict
diff --git a/devel/py-xxhash/pkg-descr b/devel/py-xxhash/pkg-descr
index c562b5e95212..5b48bc17f3b6 100644
--- a/devel/py-xxhash/pkg-descr
+++ b/devel/py-xxhash/pkg-descr
@@ -1,3 +1,3 @@
py-xxhash is a Python binding for the xxHash library by Yann Collet.
-WWW: https://pypi.python.org/pypi/xxhash
+WWW: https://pypi.org/project/xxhash/
diff --git a/devel/py-yandex-money-sdk/pkg-descr b/devel/py-yandex-money-sdk/pkg-descr
index 9b44442829fc..f9f85759d903 100644
--- a/devel/py-yandex-money-sdk/pkg-descr
+++ b/devel/py-yandex-money-sdk/pkg-descr
@@ -2,4 +2,4 @@ SDK yandex money API
API description: https://tech.yandex.com/money/
-WWW: https://pypi.python.org/pypi/yandex-money-sdk
+WWW: https://pypi.org/project/yandex-money-sdk/
diff --git a/devel/py-yappi/pkg-descr b/devel/py-yappi/pkg-descr
index 528fcae2b8d3..3949426b0dd5 100644
--- a/devel/py-yappi/pkg-descr
+++ b/devel/py-yappi/pkg-descr
@@ -3,5 +3,5 @@ Yappi is designed to work on long-running multi-threaded applications.
It is possible to profile an application, retrieve statistics, then stop and
start later on the fly without affecting the profiled application.
-WWW: https://pypi.python.org/pypi/yappi
+WWW: https://pypi.org/project/yappi/
WWW: https://bitbucket.org/sumerc/yappi
diff --git a/devel/py-yunomi/pkg-descr b/devel/py-yunomi/pkg-descr
index 6fd2545eb690..61314eea5bce 100644
--- a/devel/py-yunomi/pkg-descr
+++ b/devel/py-yunomi/pkg-descr
@@ -2,5 +2,5 @@ Yunomi provides insights to the internal behavior of an application, providing
useful statistics and metrics on selected portions of your code. It's a Python
port of the core portion of a Java Metrics library by Coda Hale.
-WWW: https://pypi.python.org/pypi/yunomi
+WWW: https://pypi.org/project/yunomi/
WWW: https://github.com/dreid/yunomi
diff --git a/devel/py-z3c.autoinclude/pkg-descr b/devel/py-z3c.autoinclude/pkg-descr
index 930461d4382a..d2fdbd641d10 100644
--- a/devel/py-z3c.autoinclude/pkg-descr
+++ b/devel/py-z3c.autoinclude/pkg-descr
@@ -1,3 +1,3 @@
Automatically include ZCML.
-WWW: https://pypi.python.org/pypi/z3c.autoinclude
+WWW: https://pypi.org/project/z3c.autoinclude/
diff --git a/devel/py-z3c.batching/pkg-descr b/devel/py-z3c.batching/pkg-descr
index 8e892fefce6b..411e44f01278 100644
--- a/devel/py-z3c.batching/pkg-descr
+++ b/devel/py-z3c.batching/pkg-descr
@@ -1,4 +1,4 @@
This module implements a simple batching mechanism that allows you to split
a large sequence into smaller batches.
-WWW: https://pypi.python.org/pypi/z3c.batching
+WWW: https://pypi.org/project/z3c.batching/
diff --git a/devel/py-z3c.caching/pkg-descr b/devel/py-z3c.caching/pkg-descr
index 2be768e23638..5ac7cd1032ab 100644
--- a/devel/py-z3c.caching/pkg-descr
+++ b/devel/py-z3c.caching/pkg-descr
@@ -1,3 +1,3 @@
Caching infrastructure for web apps.
-WWW: https://pypi.python.org/pypi/z3c.caching
+WWW: https://pypi.org/project/z3c.caching/
diff --git a/devel/py-z3c.form/pkg-descr b/devel/py-z3c.form/pkg-descr
index b2df93cf39f5..67b3e5db5cbd 100644
--- a/devel/py-z3c.form/pkg-descr
+++ b/devel/py-z3c.form/pkg-descr
@@ -1,3 +1,3 @@
An advanced form and widget framework for Zope 3.
-WWW: https://pypi.python.org/pypi/z3c.form
+WWW: https://pypi.org/project/z3c.form/
diff --git a/devel/py-z3c.formwidget.query/pkg-descr b/devel/py-z3c.formwidget.query/pkg-descr
index c90b48ffb1f2..6fd39d85737a 100644
--- a/devel/py-z3c.formwidget.query/pkg-descr
+++ b/devel/py-z3c.formwidget.query/pkg-descr
@@ -1,3 +1,3 @@
A source query widget for z3c.form.
-WWW: https://pypi.python.org/pypi/z3c.formwidget.query
+WWW: https://pypi.org/project/z3c.formwidget.query/
diff --git a/devel/py-z3c.zcmlhook/pkg-descr b/devel/py-z3c.zcmlhook/pkg-descr
index b708377c2374..4c87cbdb0234 100644
--- a/devel/py-z3c.zcmlhook/pkg-descr
+++ b/devel/py-z3c.zcmlhook/pkg-descr
@@ -1,3 +1,3 @@
Easily hook into the ZCML processing machinery.
-WWW: https://pypi.python.org/pypi/z3c.zcmlhook
+WWW: https://pypi.org/project/z3c.zcmlhook/
diff --git a/devel/py-zExceptions/pkg-descr b/devel/py-zExceptions/pkg-descr
index 828754a54b75..339e5cd21913 100644
--- a/devel/py-zExceptions/pkg-descr
+++ b/devel/py-zExceptions/pkg-descr
@@ -1,3 +1,3 @@
zExceptions contains common exceptions used in Zope2.
-WWW: https://pypi.python.org/pypi/zExceptions
+WWW: https://pypi.org/project/zExceptions/
diff --git a/devel/py-zLOG/pkg-descr b/devel/py-zLOG/pkg-descr
index 709e6e03b0bf..ce34c054f1e4 100644
--- a/devel/py-zLOG/pkg-descr
+++ b/devel/py-zLOG/pkg-descr
@@ -3,4 +3,4 @@ is just a small shim over Python's logging module. Therefore, unless
you need to support a legacy package from the Zope 2 world, you're
probably better off using Python's logging module.
-WWW: https://pypi.python.org/pypi/zLOG
+WWW: https://pypi.org/project/zLOG/
diff --git a/devel/py-zc.buildout/pkg-descr b/devel/py-zc.buildout/pkg-descr
index f8ec947ebd2d..5430b054a168 100644
--- a/devel/py-zc.buildout/pkg-descr
+++ b/devel/py-zc.buildout/pkg-descr
@@ -3,4 +3,4 @@ applications. It provides tools for assembling applications from multiple
parts, Python or otherwise. An application may actually contain multiple
programs, processes, and configuration settings.
-WWW: https://pypi.python.org/pypi/zc.buildout
+WWW: https://pypi.org/project/zc.buildout/
diff --git a/devel/py-zclockfile/pkg-descr b/devel/py-zclockfile/pkg-descr
index 61947d2e983b..758d70b1b916 100644
--- a/devel/py-zclockfile/pkg-descr
+++ b/devel/py-zclockfile/pkg-descr
@@ -7,4 +7,4 @@ storage implementation uses file locks to mediate access to
file-storage database files. The database files and lock file files
are separate files.
-WWW: https://pypi.python.org/pypi/zc.lockfile
+WWW: https://pypi.org/project/zc.lockfile/
diff --git a/devel/py-zconfig/pkg-descr b/devel/py-zconfig/pkg-descr
index 59ecafa15bd0..259d91c84ce5 100644
--- a/devel/py-zconfig/pkg-descr
+++ b/devel/py-zconfig/pkg-descr
@@ -5,4 +5,4 @@ very different from the model support by the ConfigParser module
found in Python's standard library, and is more suitable to
configuration-intensive applications.
-WWW: https://pypi.python.org/pypi/ZConfig
+WWW: https://pypi.org/project/ZConfig/
diff --git a/devel/py-zkpython/pkg-descr b/devel/py-zkpython/pkg-descr
index 8c8058cdef2f..b7b985a0d749 100644
--- a/devel/py-zkpython/pkg-descr
+++ b/devel/py-zkpython/pkg-descr
@@ -1,3 +1,3 @@
ZooKeeper Python bindings
-WWW: https://pypi.python.org/pypi/zkpython
+WWW: https://pypi.org/project/zkpython/
diff --git a/devel/py-zope.annotation/pkg-descr b/devel/py-zope.annotation/pkg-descr
index 91067e76ac0d..1fa917344558 100644
--- a/devel/py-zope.annotation/pkg-descr
+++ b/devel/py-zope.annotation/pkg-descr
@@ -1,4 +1,4 @@
This package provides a mechanism to store additional information
about objects without need to modify object class.
-WWW: https://pypi.python.org/pypi/zope.annotation
+WWW: https://pypi.org/project/zope.annotation/
diff --git a/devel/py-zope.app.applicationcontrol/pkg-descr b/devel/py-zope.app.applicationcontrol/pkg-descr
index d537635b3276..cc3b09ee7265 100644
--- a/devel/py-zope.app.applicationcontrol/pkg-descr
+++ b/devel/py-zope.app.applicationcontrol/pkg-descr
@@ -1,3 +1,3 @@
Zope application control.
-WWW: https://pypi.python.org/pypi/zope.app.applicationcontrol
+WWW: https://pypi.org/project/zope.app.applicationcontrol/
diff --git a/devel/py-zope.app.appsetup/pkg-descr b/devel/py-zope.app.appsetup/pkg-descr
index 526260de96c6..d614fa3499f8 100644
--- a/devel/py-zope.app.appsetup/pkg-descr
+++ b/devel/py-zope.app.appsetup/pkg-descr
@@ -1,3 +1,3 @@
Zope app setup helper.
-WWW: https://pypi.python.org/pypi/zope.app.appsetup
+WWW: https://pypi.org/project/zope.app.appsetup/
diff --git a/devel/py-zope.app.basicskin/pkg-descr b/devel/py-zope.app.basicskin/pkg-descr
index 379cfc6beb0d..60e0e8ca4afe 100644
--- a/devel/py-zope.app.basicskin/pkg-descr
+++ b/devel/py-zope.app.basicskin/pkg-descr
@@ -1,3 +1,3 @@
Zope ZMI Basic Skin.
-WWW: https://pypi.python.org/pypi/zope.app.basicskin
+WWW: https://pypi.org/project/zope.app.basicskin/
diff --git a/devel/py-zope.app.broken/pkg-descr b/devel/py-zope.app.broken/pkg-descr
index d2961c02d118..2283dce0f083 100644
--- a/devel/py-zope.app.broken/pkg-descr
+++ b/devel/py-zope.app.broken/pkg-descr
@@ -1,3 +1,3 @@
Zope Broken (ZODB) Object Support.
-WWW: https://pypi.python.org/pypi/zope.app.broken
+WWW: https://pypi.org/project/zope.app.broken/
diff --git a/devel/py-zope.app.cache/pkg-descr b/devel/py-zope.app.cache/pkg-descr
index ea060d752088..140dfad305d1 100644
--- a/devel/py-zope.app.cache/pkg-descr
+++ b/devel/py-zope.app.cache/pkg-descr
@@ -1,3 +1,3 @@
Zope Caching Framework.
-WWW: https://pypi.python.org/pypi/zope.app.cache
+WWW: https://pypi.org/project/zope.app.cache/
diff --git a/devel/py-zope.app.component/pkg-descr b/devel/py-zope.app.component/pkg-descr
index 27c0018cc45d..f3fbe6b219bb 100644
--- a/devel/py-zope.app.component/pkg-descr
+++ b/devel/py-zope.app.component/pkg-descr
@@ -1,3 +1,3 @@
Local Zope Component Support.
-WWW: https://pypi.python.org/pypi/zope.app.component
+WWW: https://pypi.org/project/zope.app.component/
diff --git a/devel/py-zope.app.container/pkg-descr b/devel/py-zope.app.container/pkg-descr
index 411c1ecbdddc..206591f69b2e 100644
--- a/devel/py-zope.app.container/pkg-descr
+++ b/devel/py-zope.app.container/pkg-descr
@@ -1,3 +1,3 @@
Zope Container.
-WWW: https://pypi.python.org/pypi/zope.app.container
+WWW: https://pypi.org/project/zope.app.container/
diff --git a/devel/py-zope.app.content/pkg-descr b/devel/py-zope.app.content/pkg-descr
index 67c0df605865..94b4fcf753ab 100644
--- a/devel/py-zope.app.content/pkg-descr
+++ b/devel/py-zope.app.content/pkg-descr
@@ -1,3 +1,3 @@
Zope Content Type.
-WWW: https://pypi.python.org/pypi/zope.app.content
+WWW: https://pypi.org/project/zope.app.content/
diff --git a/devel/py-zope.app.debug/pkg-descr b/devel/py-zope.app.debug/pkg-descr
index 3a00c010efed..846c3af860bd 100644
--- a/devel/py-zope.app.debug/pkg-descr
+++ b/devel/py-zope.app.debug/pkg-descr
@@ -1,3 +1,3 @@
Zope Debug Mode.
-WWW: https://pypi.python.org/pypi/zope.app.debug
+WWW: https://pypi.org/project/zope.app.debug/
diff --git a/devel/py-zope.app.dependable/pkg-descr b/devel/py-zope.app.dependable/pkg-descr
index 6b64ffbc68a1..c1e61b64f57c 100644
--- a/devel/py-zope.app.dependable/pkg-descr
+++ b/devel/py-zope.app.dependable/pkg-descr
@@ -1,3 +1,3 @@
Simple Dependency API.
-WWW: https://pypi.python.org/pypi/zope.app.dependable
+WWW: https://pypi.org/project/zope.app.dependable/
diff --git a/devel/py-zope.app.error/pkg-descr b/devel/py-zope.app.error/pkg-descr
index c3dcc6afa2ae..a4dc3fa4a712 100644
--- a/devel/py-zope.app.error/pkg-descr
+++ b/devel/py-zope.app.error/pkg-descr
@@ -1,3 +1,3 @@
Error reporting utility management UI for Zope3.
-WWW: https://pypi.python.org/pypi/zope.app.error
+WWW: https://pypi.org/project/zope.app.error/
diff --git a/devel/py-zope.app.exception/pkg-descr b/devel/py-zope.app.exception/pkg-descr
index 6e4a86525c71..0357b45304a7 100644
--- a/devel/py-zope.app.exception/pkg-descr
+++ b/devel/py-zope.app.exception/pkg-descr
@@ -1,3 +1,3 @@
Zope 3 exception views.
-WWW: https://pypi.python.org/pypi/zope.app.exception
+WWW: https://pypi.org/project/zope.app.exception/
diff --git a/devel/py-zope.app.file/pkg-descr b/devel/py-zope.app.file/pkg-descr
index 11a0c034d2dc..2d8dc2c7b530 100644
--- a/devel/py-zope.app.file/pkg-descr
+++ b/devel/py-zope.app.file/pkg-descr
@@ -1,4 +1,4 @@
This package provides two basic Zope 3 content components, File and Image,
and their ZMI-compliant browser views.
-WWW: https://pypi.python.org/pypi/zope.app.file
+WWW: https://pypi.org/project/zope.app.file/
diff --git a/devel/py-zope.app.folder/pkg-descr b/devel/py-zope.app.folder/pkg-descr
index ebbeb0122b86..9c666d5ca411 100644
--- a/devel/py-zope.app.folder/pkg-descr
+++ b/devel/py-zope.app.folder/pkg-descr
@@ -1,3 +1,3 @@
Folder Content Type for Zope 3.
-WWW: https://pypi.python.org/pypi/zope.app.folder
+WWW: https://pypi.org/project/zope.app.folder/
diff --git a/devel/py-zope.app.form/pkg-descr b/devel/py-zope.app.form/pkg-descr
index 3bf70e3d0271..a954d5decb01 100644
--- a/devel/py-zope.app.form/pkg-descr
+++ b/devel/py-zope.app.form/pkg-descr
@@ -1,3 +1,3 @@
The Original Zope 3 Form Framework.
-WWW: https://pypi.python.org/pypi/zope.app.form
+WWW: https://pypi.org/project/zope.app.form/
diff --git a/devel/py-zope.app.generations/pkg-descr b/devel/py-zope.app.generations/pkg-descr
index 5fd013e6bbb9..176227423379 100644
--- a/devel/py-zope.app.generations/pkg-descr
+++ b/devel/py-zope.app.generations/pkg-descr
@@ -1,3 +1,3 @@
ZMI UI for zope.generations.
-WWW: https://pypi.python.org/pypi/zope.app.generations
+WWW: https://pypi.org/project/zope.app.generations/
diff --git a/devel/py-zope.app.http/pkg-descr b/devel/py-zope.app.http/pkg-descr
index 13a955e1ff16..21d5f00bc34b 100644
--- a/devel/py-zope.app.http/pkg-descr
+++ b/devel/py-zope.app.http/pkg-descr
@@ -1,3 +1,3 @@
HTTP Behavior for the Zope Publisher.
-WWW: https://pypi.python.org/pypi/zope.app.http
+WWW: https://pypi.org/project/zope.app.http/
diff --git a/devel/py-zope.app.pagetemplate/pkg-descr b/devel/py-zope.app.pagetemplate/pkg-descr
index ada3134e5479..8c69798c1a3a 100644
--- a/devel/py-zope.app.pagetemplate/pkg-descr
+++ b/devel/py-zope.app.pagetemplate/pkg-descr
@@ -1,3 +1,3 @@
PageTemplate integration for Zope 3.
-WWW: https://pypi.python.org/pypi/zope.app.pagetemplate
+WWW: https://pypi.org/project/zope.app.pagetemplate/
diff --git a/devel/py-zope.app.publication/pkg-descr b/devel/py-zope.app.publication/pkg-descr
index 40bf82540bd3..da4de69271c6 100644
--- a/devel/py-zope.app.publication/pkg-descr
+++ b/devel/py-zope.app.publication/pkg-descr
@@ -1,3 +1,3 @@
Zope publication.
-WWW: https://pypi.python.org/pypi/zope.app.publication
+WWW: https://pypi.org/project/zope.app.publication/
diff --git a/devel/py-zope.app.publisher/pkg-descr b/devel/py-zope.app.publisher/pkg-descr
index 84ebd5fc4d72..796b266b79c3 100644
--- a/devel/py-zope.app.publisher/pkg-descr
+++ b/devel/py-zope.app.publisher/pkg-descr
@@ -1,3 +1,3 @@
Implementations and means for configuration of Zope 3 style views and resources.
-WWW: https://pypi.python.org/pypi/zope.app.publisher
+WWW: https://pypi.org/project/zope.app.publisher/
diff --git a/devel/py-zope.app.renderer/pkg-descr b/devel/py-zope.app.renderer/pkg-descr
index fe281bb91c56..7fa270d22824 100644
--- a/devel/py-zope.app.renderer/pkg-descr
+++ b/devel/py-zope.app.renderer/pkg-descr
@@ -1,3 +1,3 @@
Text Renderer Framework.
-WWW: https://pypi.python.org/pypi/zope.app.renderer
+WWW: https://pypi.org/project/zope.app.renderer/
diff --git a/devel/py-zope.app.rotterdam/pkg-descr b/devel/py-zope.app.rotterdam/pkg-descr
index 28209469c58b..7834248e2c00 100644
--- a/devel/py-zope.app.rotterdam/pkg-descr
+++ b/devel/py-zope.app.rotterdam/pkg-descr
@@ -1,3 +1,3 @@
A Zope 3 ZMI Skin.
-WWW: https://pypi.python.org/pypi/zope.app.rotterdam
+WWW: https://pypi.org/project/zope.app.rotterdam/
diff --git a/devel/py-zope.app.schema/pkg-descr b/devel/py-zope.app.schema/pkg-descr
index e312bc9f109a..201bdf07321c 100644
--- a/devel/py-zope.app.schema/pkg-descr
+++ b/devel/py-zope.app.schema/pkg-descr
@@ -1,3 +1,3 @@
Component Architecture based Vocabulary Registry.
-WWW: https://pypi.python.org/pypi/zope.app.schema
+WWW: https://pypi.org/project/zope.app.schema/
diff --git a/devel/py-zope.app.testing/pkg-descr b/devel/py-zope.app.testing/pkg-descr
index 449d7b6eee7e..843eb3d113db 100644
--- a/devel/py-zope.app.testing/pkg-descr
+++ b/devel/py-zope.app.testing/pkg-descr
@@ -1,3 +1,3 @@
Zope Application Testing Support.
-WWW: https://pypi.python.org/pypi/zope.app.testing
+WWW: https://pypi.org/project/zope.app.testing/
diff --git a/devel/py-zope.app.zcmlfiles/pkg-descr b/devel/py-zope.app.zcmlfiles/pkg-descr
index 287484a23995..9c183aa14b6b 100644
--- a/devel/py-zope.app.zcmlfiles/pkg-descr
+++ b/devel/py-zope.app.zcmlfiles/pkg-descr
@@ -1,3 +1,3 @@
Zope application server ZCML files.
-WWW: https://pypi.python.org/pypi/zope.app.zcmlfiles
+WWW: https://pypi.org/project/zope.app.zcmlfiles/
diff --git a/devel/py-zope.app.zopeappgenerations/pkg-descr b/devel/py-zope.app.zopeappgenerations/pkg-descr
index f3df88d45e69..07d51da84052 100644
--- a/devel/py-zope.app.zopeappgenerations/pkg-descr
+++ b/devel/py-zope.app.zopeappgenerations/pkg-descr
@@ -1,3 +1,3 @@
Zope Application ZODB Update Generations.
-WWW: https://pypi.python.org/pypi/zope.app.zopeappgenerations
+WWW: https://pypi.org/project/zope.app.zopeappgenerations/
diff --git a/devel/py-zope.applicationcontrol/pkg-descr b/devel/py-zope.applicationcontrol/pkg-descr
index 601701cd8638..9a7ac1715be8 100644
--- a/devel/py-zope.applicationcontrol/pkg-descr
+++ b/devel/py-zope.applicationcontrol/pkg-descr
@@ -1,3 +1,3 @@
Zope applicationcontrol.
-WWW: https://pypi.python.org/pypi/zope.applicationcontrol
+WWW: https://pypi.org/project/zope.applicationcontrol/
diff --git a/devel/py-zope.broken/pkg-descr b/devel/py-zope.broken/pkg-descr
index 39bdd23890e9..9f117d5f9eab 100644
--- a/devel/py-zope.broken/pkg-descr
+++ b/devel/py-zope.broken/pkg-descr
@@ -1,4 +1,4 @@
This package is Zope Broken Object Interfaces and it is obsolete and
its functionality has been merged into the ZODB3 distribution itself.
-WWW: https://pypi.python.org/pypi/zope.broken
+WWW: https://pypi.org/project/zope.broken/
diff --git a/devel/py-zope.browser/pkg-descr b/devel/py-zope.browser/pkg-descr
index 8e8e7b1d811f..d16111d0b491 100644
--- a/devel/py-zope.browser/pkg-descr
+++ b/devel/py-zope.browser/pkg-descr
@@ -1,3 +1,3 @@
This package provides shared browser components for the Zope Toolkit.
-WWW: https://pypi.python.org/pypi/zope.browser
+WWW: https://pypi.org/project/zope.browser/
diff --git a/devel/py-zope.browsermenu/pkg-descr b/devel/py-zope.browsermenu/pkg-descr
index 27e58856a1a2..5113375d68b0 100644
--- a/devel/py-zope.browsermenu/pkg-descr
+++ b/devel/py-zope.browsermenu/pkg-descr
@@ -1,4 +1,4 @@
This package provides an implementation of browser menus and
ZCML directives for configuring them.
-WWW: https://pypi.python.org/pypi/zope.browsermenu
+WWW: https://pypi.org/project/zope.browsermenu/
diff --git a/devel/py-zope.browserpage/pkg-descr b/devel/py-zope.browserpage/pkg-descr
index b496e534ee69..87b208396933 100644
--- a/devel/py-zope.browserpage/pkg-descr
+++ b/devel/py-zope.browserpage/pkg-descr
@@ -1,3 +1,3 @@
This package provides ZCML directives for configuring browser views.
-WWW: https://pypi.python.org/pypi/zope.browserpage
+WWW: https://pypi.org/project/zope.browserpage/
diff --git a/devel/py-zope.browserresource/pkg-descr b/devel/py-zope.browserresource/pkg-descr
index d07cc0728dc0..fceeb7d5b394 100644
--- a/devel/py-zope.browserresource/pkg-descr
+++ b/devel/py-zope.browserresource/pkg-descr
@@ -2,4 +2,4 @@ This package provides an implementation of browser resources.
It also provides directives for defining those resources using
ZCML.
-WWW: https://pypi.python.org/pypi/zope.browserresource
+WWW: https://pypi.org/project/zope.browserresource/
diff --git a/devel/py-zope.cachedescriptors/pkg-descr b/devel/py-zope.cachedescriptors/pkg-descr
index 39e12d2b2e56..e2b8ff0987fd 100644
--- a/devel/py-zope.cachedescriptors/pkg-descr
+++ b/devel/py-zope.cachedescriptors/pkg-descr
@@ -1,3 +1,3 @@
Method and property caching decorators.
-WWW: https://pypi.python.org/pypi/zope.cachedescriptors
+WWW: https://pypi.org/project/zope.cachedescriptors/
diff --git a/devel/py-zope.component/pkg-descr b/devel/py-zope.component/pkg-descr
index b01834368d42..aff2f7c7fd40 100644
--- a/devel/py-zope.component/pkg-descr
+++ b/devel/py-zope.component/pkg-descr
@@ -10,4 +10,4 @@ Adapters are components that are computed from other components
to adapt them to some interface. Because they are computed from
other objects, they are provided as factories, usually classes.
-WWW: https://pypi.python.org/pypi/zope.component
+WWW: https://pypi.org/project/zope.component/
diff --git a/devel/py-zope.componentvocabulary/pkg-descr b/devel/py-zope.componentvocabulary/pkg-descr
index bd691b85eb99..3748af1934f9 100644
--- a/devel/py-zope.componentvocabulary/pkg-descr
+++ b/devel/py-zope.componentvocabulary/pkg-descr
@@ -1,3 +1,3 @@
Component vocabularies.
-WWW: https://pypi.python.org/pypi/zope.componentvocabulary
+WWW: https://pypi.org/project/zope.componentvocabulary/
diff --git a/devel/py-zope.configuration/pkg-descr b/devel/py-zope.configuration/pkg-descr
index 000be3b2d25a..a6a839ce1aec 100644
--- a/devel/py-zope.configuration/pkg-descr
+++ b/devel/py-zope.configuration/pkg-descr
@@ -6,4 +6,4 @@ configuration system provide configuration directives in some language
that express configuration choices. The intent is that the language be
pluggable. An XML language is provided by default.
-WWW: https://pypi.python.org/pypi/zope.configuration
+WWW: https://pypi.org/project/zope.configuration/
diff --git a/devel/py-zope.container/pkg-descr b/devel/py-zope.container/pkg-descr
index 3e2f10a2a674..962dba61285c 100644
--- a/devel/py-zope.container/pkg-descr
+++ b/devel/py-zope.container/pkg-descr
@@ -3,4 +3,4 @@ container implementations such as a BTreeContainer and OrderedContainer,
as well as the base class used by zope.site.folder for the Folder
implementation.
-WWW: https://pypi.python.org/pypi/zope.container
+WWW: https://pypi.org/project/zope.container/
diff --git a/devel/py-zope.contentprovider/pkg-descr b/devel/py-zope.contentprovider/pkg-descr
index 9d530fa1a7b3..298c2b499d75 100644
--- a/devel/py-zope.contentprovider/pkg-descr
+++ b/devel/py-zope.contentprovider/pkg-descr
@@ -4,4 +4,4 @@ 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.
-WWW: https://pypi.python.org/pypi/zope.contentprovider
+WWW: https://pypi.org/project/zope.contentprovider/
diff --git a/devel/py-zope.contenttype/pkg-descr b/devel/py-zope.contenttype/pkg-descr
index fa2b6ea0790f..c636b3c78e47 100644
--- a/devel/py-zope.contenttype/pkg-descr
+++ b/devel/py-zope.contenttype/pkg-descr
@@ -1,3 +1,3 @@
zope.contenttype is a utility module for content-type handling.
-WWW: https://pypi.python.org/pypi/zope.contenttype
+WWW: https://pypi.org/project/zope.contenttype/
diff --git a/devel/py-zope.copy/pkg-descr b/devel/py-zope.copy/pkg-descr
index bbc0cdf6a2fd..b64529331add 100644
--- a/devel/py-zope.copy/pkg-descr
+++ b/devel/py-zope.copy/pkg-descr
@@ -3,4 +3,4 @@ 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.
-WWW: https://pypi.python.org/pypi/zope.copy
+WWW: https://pypi.org/project/zope.copy/
diff --git a/devel/py-zope.copypastemove/pkg-descr b/devel/py-zope.copypastemove/pkg-descr
index f8238fa007c2..5834f519e960 100644
--- a/devel/py-zope.copypastemove/pkg-descr
+++ b/devel/py-zope.copypastemove/pkg-descr
@@ -1,3 +1,3 @@
Copy, Paste and Move support for content components.
-WWW: https://pypi.python.org/pypi/zope.copypastemove
+WWW: https://pypi.org/project/zope.copypastemove/
diff --git a/devel/py-zope.datetime/pkg-descr b/devel/py-zope.datetime/pkg-descr
index da9218eaa4f7..1129802b30b8 100644
--- a/devel/py-zope.datetime/pkg-descr
+++ b/devel/py-zope.datetime/pkg-descr
@@ -1,4 +1,4 @@
zope.datetime is a set of commonly used date and time related
utility functions.
-WWW: https://pypi.python.org/pypi/zope.datetime
+WWW: https://pypi.org/project/zope.datetime/
diff --git a/devel/py-zope.deferredimport/pkg-descr b/devel/py-zope.deferredimport/pkg-descr
index 3c3effb02f31..5b39fe8b6e0f 100644
--- a/devel/py-zope.deferredimport/pkg-descr
+++ b/devel/py-zope.deferredimport/pkg-descr
@@ -1,4 +1,4 @@
zope.deferredimport allows you to perform imports names
that will only be resolved when used in the code.
-WWW: https://pypi.python.org/pypi/zope.deferredimport
+WWW: https://pypi.org/project/zope.deferredimport/
diff --git a/devel/py-zope.deprecation/pkg-descr b/devel/py-zope.deprecation/pkg-descr
index 674803bd2977..aa46a28cc553 100644
--- a/devel/py-zope.deprecation/pkg-descr
+++ b/devel/py-zope.deprecation/pkg-descr
@@ -6,4 +6,4 @@ zope.deprecation provides a simple function called
'deprecated(names, reason)' to deprecate the previously mentioned
Python objects.
-WWW: https://pypi.python.org/pypi/zope.deprecation
+WWW: https://pypi.org/project/zope.deprecation/
diff --git a/devel/py-zope.dottedname/pkg-descr b/devel/py-zope.dottedname/pkg-descr
index 46ce45aa34cc..908184476172 100644
--- a/devel/py-zope.dottedname/pkg-descr
+++ b/devel/py-zope.dottedname/pkg-descr
@@ -2,4 +2,4 @@ The zope.dottedname module provides one function, resolve that
resolves strings containing dotted names into the appropriate
python object.
-WWW: https://pypi.python.org/pypi/zope.dottedname
+WWW: https://pypi.org/project/zope.dottedname/
diff --git a/devel/py-zope.dublincore/pkg-descr b/devel/py-zope.dublincore/pkg-descr
index 057841c33fc0..cdc0eb3ffaf7 100644
--- a/devel/py-zope.dublincore/pkg-descr
+++ b/devel/py-zope.dublincore/pkg-descr
@@ -1,3 +1,3 @@
Zope Dublin Core implementation.
-WWW: https://pypi.python.org/pypi/zope.dublincore
+WWW: https://pypi.org/project/zope.dublincore/
diff --git a/devel/py-zope.error/pkg-descr b/devel/py-zope.error/pkg-descr
index 95d2b85b5a55..2402bdc4f597 100644
--- a/devel/py-zope.error/pkg-descr
+++ b/devel/py-zope.error/pkg-descr
@@ -1,3 +1,3 @@
An error reporting utility for Zope3.
-WWW: https://pypi.python.org/pypi/zope.error
+WWW: https://pypi.org/project/zope.error/
diff --git a/devel/py-zope.event/pkg-descr b/devel/py-zope.event/pkg-descr
index eef63e1b1db7..d1ef555bdadb 100644
--- a/devel/py-zope.event/pkg-descr
+++ b/devel/py-zope.event/pkg-descr
@@ -4,4 +4,4 @@ event systems can be built.
Application code can generate events without being concerned about the
event-processing frameworks that might handle the events.
-WWW: https://pypi.python.org/pypi/zope.event
+WWW: https://pypi.org/project/zope.event/
diff --git a/devel/py-zope.exceptions/pkg-descr b/devel/py-zope.exceptions/pkg-descr
index 46f785c86d69..b6fb627ec914 100644
--- a/devel/py-zope.exceptions/pkg-descr
+++ b/devel/py-zope.exceptions/pkg-descr
@@ -2,4 +2,4 @@ zope.exceptions contains exception interfaces and implementations
which are so general purpose that they don't belong in Zope
application-specific packages.
-WWW: https://pypi.python.org/pypi/zope.exceptions
+WWW: https://pypi.org/project/zope.exceptions/
diff --git a/devel/py-zope.filerepresentation/pkg-descr b/devel/py-zope.filerepresentation/pkg-descr
index 095b4c36a61e..c96eea7ac432 100644
--- a/devel/py-zope.filerepresentation/pkg-descr
+++ b/devel/py-zope.filerepresentation/pkg-descr
@@ -3,4 +3,4 @@ The interfaces defined here are used for file-system and
file-system-like representations of objects, such as file-system
synchronization, FTP, PUT, and WebDAV.
-WWW: https://pypi.python.org/pypi/zope.filerepresentation
+WWW: https://pypi.org/project/zope.filerepresentation/
diff --git a/devel/py-zope.formlib/pkg-descr b/devel/py-zope.formlib/pkg-descr
index 9f260465075e..2234018cb0c4 100644
--- a/devel/py-zope.formlib/pkg-descr
+++ b/devel/py-zope.formlib/pkg-descr
@@ -1,3 +1,3 @@
Form generation and validation library for Zope.
-WWW: https://pypi.python.org/pypi/zope.formlib
+WWW: https://pypi.org/project/zope.formlib/
diff --git a/devel/py-zope.generations/pkg-descr b/devel/py-zope.generations/pkg-descr
index 842679c7adc3..6c0af4564c36 100644
--- a/devel/py-zope.generations/pkg-descr
+++ b/devel/py-zope.generations/pkg-descr
@@ -1,3 +1,3 @@
Zope application schema generations.
-WWW: https://pypi.python.org/pypi/zope.generations
+WWW: https://pypi.org/project/zope.generations/
diff --git a/devel/py-zope.globalrequest/pkg-descr b/devel/py-zope.globalrequest/pkg-descr
index 7759097b38d2..d86b09f47a1b 100644
--- a/devel/py-zope.globalrequest/pkg-descr
+++ b/devel/py-zope.globalrequest/pkg-descr
@@ -1,3 +1,3 @@
Global way of retrieving the currently active request.
-WWW: https://pypi.python.org/pypi/zope.globalrequest
+WWW: https://pypi.org/project/zope.globalrequest/
diff --git a/devel/py-zope.interface/pkg-descr b/devel/py-zope.interface/pkg-descr
index b51b27167cf0..9344acedf07d 100644
--- a/devel/py-zope.interface/pkg-descr
+++ b/devel/py-zope.interface/pkg-descr
@@ -3,4 +3,4 @@ Interfaces are a mechanism for labeling objects as conforming to a given API or
contract. So, this package can be considered as implementation of the Design By
Contract methodology support in Python.
-WWW: https://pypi.python.org/pypi/zope.interface
+WWW: https://pypi.org/project/zope.interface/
diff --git a/devel/py-zope.lifecycleevent/pkg-descr b/devel/py-zope.lifecycleevent/pkg-descr
index 210baabe17af..c4d662c925f0 100644
--- a/devel/py-zope.lifecycleevent/pkg-descr
+++ b/devel/py-zope.lifecycleevent/pkg-descr
@@ -1,3 +1,3 @@
Object life-cycle events.
-WWW: https://pypi.python.org/pypi/zope.lifecycleevent
+WWW: https://pypi.org/project/zope.lifecycleevent/
diff --git a/devel/py-zope.location/pkg-descr b/devel/py-zope.location/pkg-descr
index 09b11dfa7fcd..88e100a0df40 100644
--- a/devel/py-zope.location/pkg-descr
+++ b/devel/py-zope.location/pkg-descr
@@ -1,3 +1,3 @@
zope.location are special objects that has a structural location.
-WWW: https://pypi.python.org/pypi/zope.location
+WWW: https://pypi.org/project/zope.location/
diff --git a/devel/py-zope.minmax/pkg-descr b/devel/py-zope.minmax/pkg-descr
index 5eb38d489564..1ff2b729544a 100644
--- a/devel/py-zope.minmax/pkg-descr
+++ b/devel/py-zope.minmax/pkg-descr
@@ -5,4 +5,4 @@ and apply different conflict resolution policies.
The subclasses defined here are resolving the conflicts using always
either the maximum or the minimum of the conflicting values.
-WWW: https://pypi.python.org/pypi/zope.minmax
+WWW: https://pypi.org/project/zope.minmax/
diff --git a/devel/py-zope.pagetemplate/pkg-descr b/devel/py-zope.pagetemplate/pkg-descr
index ac58704796e8..6090eddfe5b9 100644
--- a/devel/py-zope.pagetemplate/pkg-descr
+++ b/devel/py-zope.pagetemplate/pkg-descr
@@ -3,4 +3,4 @@ a clean separation of presentation and application logic while
allowing for designers to work with templates in their visual editing
tools (FrontPage, Dreamweaver, GoLive, etc.).
-WWW: https://pypi.python.org/pypi/zope.pagetemplate
+WWW: https://pypi.org/project/zope.pagetemplate/
diff --git a/devel/py-zope.processlifetime/pkg-descr b/devel/py-zope.processlifetime/pkg-descr
index da935a72b734..eb5c61a41439 100644
--- a/devel/py-zope.processlifetime/pkg-descr
+++ b/devel/py-zope.processlifetime/pkg-descr
@@ -1,4 +1,4 @@
This package provides interfaces/implementations for events relative
to the lifetime of a server process (startup, database opening, etc.)
-WWW: https://pypi.python.org/pypi/zope.processlifetime
+WWW: https://pypi.org/project/zope.processlifetime/
diff --git a/devel/py-zope.ptresource/pkg-descr b/devel/py-zope.ptresource/pkg-descr
index 4d5b1bea6d85..4f79e1917d86 100644
--- a/devel/py-zope.ptresource/pkg-descr
+++ b/devel/py-zope.ptresource/pkg-descr
@@ -2,4 +2,4 @@ This package provides a "page template" resource class, a resource
which content is processed with Zope Page Templates engine before
returning to client.
-WWW: https://pypi.python.org/pypi/zope.ptresource
+WWW: https://pypi.org/project/zope.ptresource/
diff --git a/devel/py-zope.publisher/pkg-descr b/devel/py-zope.publisher/pkg-descr
index 03480e60d679..b8819927366f 100644
--- a/devel/py-zope.publisher/pkg-descr
+++ b/devel/py-zope.publisher/pkg-descr
@@ -5,4 +5,4 @@ represented by request and response objects which allow for easy
client interaction from Python. The behaviour of the publisher
is geared towards WSGI compatibility.
-WWW: https://pypi.python.org/pypi/zope.publisher
+WWW: https://pypi.org/project/zope.publisher/
diff --git a/devel/py-zope.ramcache/pkg-descr b/devel/py-zope.ramcache/pkg-descr
index a5a1cef9a5ad..0152c7d5a170 100644
--- a/devel/py-zope.ramcache/pkg-descr
+++ b/devel/py-zope.ramcache/pkg-descr
@@ -1,3 +1,3 @@
Zope RAM Cache.
-WWW: https://pypi.python.org/pypi/zope.ramcache
+WWW: https://pypi.org/project/zope.ramcache/
diff --git a/devel/py-zope.schema/pkg-descr b/devel/py-zope.schema/pkg-descr
index 5446a251dd5d..6e220f6ad14d 100644
--- a/devel/py-zope.schema/pkg-descr
+++ b/devel/py-zope.schema/pkg-descr
@@ -5,4 +5,4 @@ But a Field provides space for at least a title and a description. It can also
constrain its value and provide a validation method. Besides you can optionally
specify characteristics such as its value being read-only or not required.
-WWW: https://pypi.python.org/pypi/zope.schema
+WWW: https://pypi.org/project/zope.schema/
diff --git a/devel/py-zope.sequencesort/pkg-descr b/devel/py-zope.sequencesort/pkg-descr
index 6a92c09a83b4..fd9d2b068749 100644
--- a/devel/py-zope.sequencesort/pkg-descr
+++ b/devel/py-zope.sequencesort/pkg-descr
@@ -1,3 +1,3 @@
This package provides a very advanced sequence sorting feature.
-WWW: https://pypi.python.org/pypi/zope.sequencesort
+WWW: https://pypi.org/project/zope.sequencesort/
diff --git a/devel/py-zope.site/pkg-descr b/devel/py-zope.site/pkg-descr
index 5ddb8147f482..f930f8494a71 100644
--- a/devel/py-zope.site/pkg-descr
+++ b/devel/py-zope.site/pkg-descr
@@ -4,4 +4,4 @@ adapter registries for its adapter and utility registry. The module also
provides some facilities to organize the local software and ensures the
correct behavior inside the ZODB.
-WWW: https://pypi.python.org/pypi/zope.site
+WWW: https://pypi.org/project/zope.site/
diff --git a/devel/py-zope.size/pkg-descr b/devel/py-zope.size/pkg-descr
index 192f210b083e..b2746d970ec9 100644
--- a/devel/py-zope.size/pkg-descr
+++ b/devel/py-zope.size/pkg-descr
@@ -1,4 +1,4 @@
This package provides a definition of simple interface that allows
to retrieve the size of the object for displaying and for sorting.
-WWW: https://pypi.python.org/pypi/zope.size
+WWW: https://pypi.org/project/zope.size/
diff --git a/devel/py-zope.tales/pkg-descr b/devel/py-zope.tales/pkg-descr
index 478632aec6ed..2dd9bc167dab 100644
--- a/devel/py-zope.tales/pkg-descr
+++ b/devel/py-zope.tales/pkg-descr
@@ -1,3 +1,3 @@
Zope Template Application Language Expression Syntax (TALES).
-WWW: https://pypi.python.org/pypi/zope.tales
+WWW: https://pypi.org/project/zope.tales/
diff --git a/devel/py-zope.testbrowser/pkg-descr b/devel/py-zope.testbrowser/pkg-descr
index ab1498362901..8789ab1b56bd 100644
--- a/devel/py-zope.testbrowser/pkg-descr
+++ b/devel/py-zope.testbrowser/pkg-descr
@@ -3,4 +3,4 @@ with special focus on testing. It is used in Zope, but it's not
Zope specific at all. For instance, it can be used to test or
otherwise interact with any web site.
-WWW: https://pypi.python.org/pypi/zope.testbrowser
+WWW: https://pypi.org/project/zope.testbrowser/
diff --git a/devel/py-zope.testing/pkg-descr b/devel/py-zope.testing/pkg-descr
index a71bf58df7c2..a110573fa5c0 100644
--- a/devel/py-zope.testing/pkg-descr
+++ b/devel/py-zope.testing/pkg-descr
@@ -2,4 +2,4 @@ zope.testing is a package provides a number of testing
frameworks. It includes a flexible test runner, and
supports both doctest and unittest.
-WWW: https://pypi.python.org/pypi/zope.testing
+WWW: https://pypi.org/project/zope.testing/
diff --git a/devel/py-zope.traversing/pkg-descr b/devel/py-zope.traversing/pkg-descr
index 10b28b6a0da5..119207d8e498 100644
--- a/devel/py-zope.traversing/pkg-descr
+++ b/devel/py-zope.traversing/pkg-descr
@@ -1,4 +1,4 @@
The zope.traversing package provides adapteres for resolving object
paths by traversing an object hierarchy.
-WWW: https://pypi.python.org/pypi/zope.traversing
+WWW: https://pypi.org/project/zope.traversing/
diff --git a/devel/py-zope.viewlet/pkg-descr b/devel/py-zope.viewlet/pkg-descr
index 0211b1e30922..54ac87c9bbda 100644
--- a/devel/py-zope.viewlet/pkg-descr
+++ b/devel/py-zope.viewlet/pkg-descr
@@ -1,4 +1,4 @@
Viewlets provide a generic framework for building pluggable
user interfaces.
-WWW: https://pypi.python.org/pypi/zope.viewlet
+WWW: https://pypi.org/project/zope.viewlet/
diff --git a/devel/py_static_check/pkg-descr b/devel/py_static_check/pkg-descr
index 93947ff3c4a4..75ea8bda8875 100644
--- a/devel/py_static_check/pkg-descr
+++ b/devel/py_static_check/pkg-descr
@@ -6,4 +6,4 @@ code and extends with following things:
Ability to ignore unused import warnings (-i argument)
Better sorting of warnings/errors
-WWW: https://pypi.python.org/pypi/py_static_check
+WWW: https://pypi.org/project/py_static_check/
diff --git a/devel/pylint/pkg-descr b/devel/pylint/pkg-descr
index a3a5976d68fd..65d2a105d23a 100644
--- a/devel/pylint/pkg-descr
+++ b/devel/pylint/pkg-descr
@@ -8,5 +8,5 @@ it from within your code. Additionally, it is possible to write plugins to add
your own checks.
WWW: https://www.pylint.org/
-WWW: https://pypi.python.org/pypi/pylint
+WWW: https://pypi.org/project/pylint/
WWW: https://github.com/PyCQA/pylint
diff --git a/devel/pythk/pkg-descr b/devel/pythk/pkg-descr
index f194d09bb264..b3135fa8f93d 100644
--- a/devel/pythk/pkg-descr
+++ b/devel/pythk/pkg-descr
@@ -1,3 +1,3 @@
pythk is a collection of functions for Python. It is used by sqlcc.
-WWW: https://pypi.python.org/pypi/pythk
+WWW: https://pypi.org/project/pythk/
diff --git a/dns/py-idna_ssl/pkg-descr b/dns/py-idna_ssl/pkg-descr
index f96b06db745f..a9e8b0bc2d59 100644
--- a/dns/py-idna_ssl/pkg-descr
+++ b/dns/py-idna_ssl/pkg-descr
@@ -1,4 +1,4 @@
idna-ssl patches ssl.match_hostname for Unicode(idna) domains support.
-WWW: https://pypi.python.org/pypi/idna_ssl
+WWW: https://pypi.org/project/idna_ssl/
WWW: https://github.com/aio-libs/idna-ssl
diff --git a/dns/py-publicsuffix/pkg-descr b/dns/py-publicsuffix/pkg-descr
index 0081d4414872..11bcc4bdae67 100644
--- a/dns/py-publicsuffix/pkg-descr
+++ b/dns/py-publicsuffix/pkg-descr
@@ -7,4 +7,4 @@ Accurately knowing the public suffix of a domain is useful when handling web
browser cookies, highlighting the most important part of a domain name in a
user interface or sorting URLs by web site
-WWW: https://pypi.python.org/pypi/publicsuffix
+WWW: https://pypi.org/project/publicsuffix/
diff --git a/dns/py-py3dns/pkg-descr b/dns/py-py3dns/pkg-descr
index 4712f056eebb..1b7e1d5f1d64 100644
--- a/dns/py-py3dns/pkg-descr
+++ b/dns/py-py3dns/pkg-descr
@@ -2,5 +2,5 @@ This directory contains a Python module that implements a DNS (Domain
Name Server) client, plus additional modules that define some symbolic
constants used by DNS (dnstype, dnsclass, dnsopcode).
-WWW: https://pypi.python.org/pypi/py3dns
+WWW: https://pypi.org/project/py3dns/
WWW: https://launchpad.net/py3dns
diff --git a/dns/py-pycares/pkg-descr b/dns/py-pycares/pkg-descr
index b7f1a186f8c6..832da84fa74b 100644
--- a/dns/py-pycares/pkg-descr
+++ b/dns/py-pycares/pkg-descr
@@ -2,4 +2,4 @@ pycares is a Python module which provides an interface to c-ares.
c-ares is a C library that performs DNS requests and name
resolutions asynchronously.
-WWW: https://pypi.python.org/pypi/pycares
+WWW: https://pypi.org/project/pycares/
diff --git a/ftp/py-pycurl/pkg-descr b/ftp/py-pycurl/pkg-descr
index 3da4d4dbde4a..45c7dea9fdfb 100644
--- a/ftp/py-pycurl/pkg-descr
+++ b/ftp/py-pycurl/pkg-descr
@@ -12,5 +12,5 @@ PycURL exposes most of the functionality of libcurl, including:
- Sockets used for network operations, permitting integration of PycURL into the
applications' I/O loop (e.g., using Tornado).
-WWW: https://pypi.python.org/pypi/pycurl
+WWW: https://pypi.org/project/pycurl/
WWW: http://pycurl.io/
diff --git a/graphics/py-blockdiagcontrib-cisco/pkg-descr b/graphics/py-blockdiagcontrib-cisco/pkg-descr
index 9c3eced5baf5..2ff95b6e3957 100644
--- a/graphics/py-blockdiagcontrib-cisco/pkg-descr
+++ b/graphics/py-blockdiagcontrib-cisco/pkg-descr
@@ -4,4 +4,4 @@ The shapes are using Network Topology Icons designed by Cisco Systems, Inc.
o Network Topology Icons: http://www.cisco.com/web/about/ac50/ac47/2.html
o Cisco Systems, Inc: http://www.cisco.com/
-WWW: https://pypi.python.org/pypi/blockdiagcontrib-cisco
+WWW: https://pypi.org/project/blockdiagcontrib-cisco/
diff --git a/graphics/py-django-easy-thumbnails/pkg-descr b/graphics/py-django-easy-thumbnails/pkg-descr
index f31a88c703cb..cb23567a0210 100644
--- a/graphics/py-django-easy-thumbnails/pkg-descr
+++ b/graphics/py-django-easy-thumbnails/pkg-descr
@@ -5,5 +5,5 @@ is generated (and saved). Thumbnail aliases can be defined, providing
predefined thumbnail options. This also allows for generation of thumbnails
when the source image is uploaded.
-WWW: https://pypi.python.org/pypi/easy-thumbnails
+WWW: https://pypi.org/project/easy-thumbnails/
WWW: https://github.com/SmileyChris/easy-thumbnails
diff --git a/graphics/py-djvulibre/pkg-descr b/graphics/py-djvulibre/pkg-descr
index b33b77519c9c..e1de046e262b 100644
--- a/graphics/py-djvulibre/pkg-descr
+++ b/graphics/py-djvulibre/pkg-descr
@@ -1,5 +1,5 @@
A set of Python bindings for the DjVuLibre library, an open source
implementation of DjVu.
-WWW: https://pypi.python.org/pypi/python-djvulibre
+WWW: https://pypi.org/project/python-djvulibre/
WWW: http://jwilk.net/software/python-djvulibre
diff --git a/graphics/py-gphoto2/pkg-descr b/graphics/py-gphoto2/pkg-descr
index b9be8fe39bb5..6abcea21d994 100644
--- a/graphics/py-gphoto2/pkg-descr
+++ b/graphics/py-gphoto2/pkg-descr
@@ -1,3 +1,3 @@
python-gphoto2 provides Python interface to libgphoto2.
-WWW: https://pypi.python.org/pypi/gphoto2
+WWW: https://pypi.org/project/gphoto2/
diff --git a/graphics/py-pivy/pkg-descr b/graphics/py-pivy/pkg-descr
index eac4237009df..84e2e1cb8f5a 100644
--- a/graphics/py-pivy/pkg-descr
+++ b/graphics/py-pivy/pkg-descr
@@ -5,4 +5,4 @@ with a C++ Application Programming Interface. Coin uses scene-graph data
structures to render real-time graphics suitable for mostly all kinds of
scientific and engineering visualization applications.
-WWW: https://pypi.python.org/pypi/Pivy
+WWW: https://pypi.org/project/Pivy/
diff --git a/graphics/py-poppler-qt4/pkg-descr b/graphics/py-poppler-qt4/pkg-descr
index ad6ccb76adc2..55f6ca4757de 100644
--- a/graphics/py-poppler-qt4/pkg-descr
+++ b/graphics/py-poppler-qt4/pkg-descr
@@ -1,3 +1,3 @@
Python bindings for graphics/poppler-qt4.
-WWW: https://pypi.python.org/pypi/python-poppler-qt4
+WWW: https://pypi.org/project/python-poppler-qt4/
diff --git a/graphics/py-pyganim/pkg-descr b/graphics/py-pyganim/pkg-descr
index 3fd3e33da0f8..af28a0440ebd 100644
--- a/graphics/py-pyganim/pkg-descr
+++ b/graphics/py-pyganim/pkg-descr
@@ -4,5 +4,5 @@ Pyganim works with Python 2 and Python 3.
The mascot of Pyganim is a red vitruvian pig.
-WWW: https://pypi.python.org/pypi/Pyganim
+WWW: https://pypi.org/project/Pyganim/
WWW: https://inventwithpython.com/pyganim/
diff --git a/graphics/py-pyglet/pkg-descr b/graphics/py-pyglet/pkg-descr
index 0fe068fc3999..44279ba9d54b 100644
--- a/graphics/py-pyglet/pkg-descr
+++ b/graphics/py-pyglet/pkg-descr
@@ -3,4 +3,4 @@ developing games and other visually-rich applications for Windows,
Mac OS X and Linux.
WWW: https://bitbucket.org/pyglet/pyglet/wiki/Home
-WWW: https://pypi.python.org/pypi/pyglet
+WWW: https://pypi.org/project/pyglet/
diff --git a/graphics/py-toyplot/pkg-descr b/graphics/py-toyplot/pkg-descr
index e278ee8527f9..0463158b2efa 100644
--- a/graphics/py-toyplot/pkg-descr
+++ b/graphics/py-toyplot/pkg-descr
@@ -7,4 +7,4 @@ Toyplot is a kid-sized plotting toolkit for Python with grownup-sized goals:
* Provide a clean, minimalist interface that scientists and engineers will
love.
-WWW: https://pypi.python.org/pypi/toyplot
+WWW: https://pypi.org/project/toyplot/
diff --git a/graphics/pymorph/pkg-descr b/graphics/pymorph/pkg-descr
index fc84e57105d0..ffbbc7e1a5fc 100644
--- a/graphics/pymorph/pkg-descr
+++ b/graphics/pymorph/pkg-descr
@@ -4,4 +4,4 @@ morphology operations, working with numpy arrays representing images.
Includes basic operations for morphological image processing such as erode,
dilate, open, tophat opening, watershed and more.
-WWW: https://pypi.python.org/pypi/pymorph
+WWW: https://pypi.org/project/pymorph/
diff --git a/mail/py-Products.MailHost/pkg-descr b/mail/py-Products.MailHost/pkg-descr
index a7d232d474cb..3c06e2b8e0e3 100644
--- a/mail/py-Products.MailHost/pkg-descr
+++ b/mail/py-Products.MailHost/pkg-descr
@@ -1,4 +1,4 @@
The MailHost product provides support for sending email from within
the Zope environment using MailHost objects.
-WWW: https://pypi.python.org/pypi/Products.MailHost
+WWW: https://pypi.org/project/Products.MailHost/
diff --git a/mail/py-Products.SecureMailHost/pkg-descr b/mail/py-Products.SecureMailHost/pkg-descr
index 75f7b09ea873..0613d1600679 100644
--- a/mail/py-Products.SecureMailHost/pkg-descr
+++ b/mail/py-Products.SecureMailHost/pkg-descr
@@ -1,4 +1,4 @@
SecureMailHost is a reimplementation of the standard Zope2 MailHost
with some security and usability enhancements.
-WWW: https://pypi.python.org/pypi/Products.SecureMailHost
+WWW: https://pypi.org/project/Products.SecureMailHost/
diff --git a/mail/py-pyspf/pkg-descr b/mail/py-pyspf/pkg-descr
index 1136b79dbfff..5a424975265a 100644
--- a/mail/py-pyspf/pkg-descr
+++ b/mail/py-pyspf/pkg-descr
@@ -3,4 +3,4 @@ was the first SPF implementation to fully conform to RFC 4408. This
release has also added IPv6 support. pyspf is the library behind
several of the open SPF project's SPF record testing tools.
-WWW: https://pypi.python.org/pypi/pyspf
+WWW: https://pypi.org/project/pyspf/
diff --git a/mail/py-zope.sendmail/pkg-descr b/mail/py-zope.sendmail/pkg-descr
index 663a2762ec97..e4a8e190b14e 100644
--- a/mail/py-zope.sendmail/pkg-descr
+++ b/mail/py-zope.sendmail/pkg-descr
@@ -1,3 +1,3 @@
zope.sendmail is a package for email sending from Zope3 applications.
-WWW: https://pypi.python.org/pypi/zope.sendmail
+WWW: https://pypi.org/project/zope.sendmail/
diff --git a/math/py-altgraph/pkg-descr b/math/py-altgraph/pkg-descr
index 41fa00747010..30162a5d9cc3 100644
--- a/math/py-altgraph/pkg-descr
+++ b/math/py-altgraph/pkg-descr
@@ -5,4 +5,4 @@ graphviz output.
altgraph includes some additional usage of Python 2.6+ features and
enhancements related to modulegraph and macholib.
-WWW: https://pypi.python.org/pypi/altgraph
+WWW: https://pypi.org/project/altgraph/
diff --git a/math/py-colormath/pkg-descr b/math/py-colormath/pkg-descr
index 08766dc5ed55..4953a17db6cf 100644
--- a/math/py-colormath/pkg-descr
+++ b/math/py-colormath/pkg-descr
@@ -12,4 +12,4 @@ Some features include:
* RGB to hex and vice-versa.
* 16-bit RGB support.
-WWW: https://pypi.python.org/pypi/colormath
+WWW: https://pypi.org/project/colormath/
diff --git a/math/py-fastcluster/pkg-descr b/math/py-fastcluster/pkg-descr
index 7af1b6ba631c..a0b61cfbf2b4 100644
--- a/math/py-fastcluster/pkg-descr
+++ b/math/py-fastcluster/pkg-descr
@@ -12,5 +12,5 @@ easier to port from MATLAB to Python/NumPy. The core implementation of this
library is in C++ for efficiency.
WWW: http://danifold.net/fastcluster.html
-WWW: https://pypi.python.org/pypi/fastcluster
+WWW: https://pypi.org/project/fastcluster/
WWW: https://github.com/dmuellner/fastcluster
diff --git a/math/py-fpconst/pkg-descr b/math/py-fpconst/pkg-descr
index d10391d24b1a..4fc694a40660 100644
--- a/math/py-fpconst/pkg-descr
+++ b/math/py-fpconst/pkg-descr
@@ -3,4 +3,4 @@ IEEE754 double-precision special values. It provides constants for
Not-a-Number (NaN), Positive Infinity (Inf), and Negative Infinity (-Inf),
as well as functions to test for these values.
-WWW: https://pypi.python.org/pypi/fpconst
+WWW: https://pypi.org/project/fpconst/
diff --git a/math/py-gmpy2/pkg-descr b/math/py-gmpy2/pkg-descr
index a2466f294ed1..7a808dd83afa 100644
--- a/math/py-gmpy2/pkg-descr
+++ b/math/py-gmpy2/pkg-descr
@@ -4,5 +4,5 @@ rational arithmetic, gmpy2 adds support for the MPFR (correctly rounded real
floating-point arithmetic) and MPC (correctly rounded complex floating-point
arithmetic) libraries.
-WWW: https://pypi.python.org/pypi/gmpy2
+WWW: https://pypi.org/project/gmpy2/
WWW: https://github.com/aleaxit/gmpy/releases
diff --git a/math/py-intspan/pkg-descr b/math/py-intspan/pkg-descr
index 79e5734307c0..48952be57362 100644
--- a/math/py-intspan/pkg-descr
+++ b/math/py-intspan/pkg-descr
@@ -2,4 +2,4 @@ intspan is a set subclass that conveniently stores sets of integers.
Sets can be created from and displayed as integer spans such as
1-3,14,29,92-97 rather than exhaustive member listings.
-WWW: https://pypi.python.org/pypi/intspan
+WWW: https://pypi.org/project/intspan/
diff --git a/math/py-mathdom/pkg-descr b/math/py-mathdom/pkg-descr
index b23d0c4c74f8..cf2848ea858c 100644
--- a/math/py-mathdom/pkg-descr
+++ b/math/py-mathdom/pkg-descr
@@ -8,4 +8,4 @@ methods that make using the DOM a little easier.
Implementations based on PyXML and lxml/libxml2 are
available.
-WWW: https://pypi.python.org/pypi/mathdom
+WWW: https://pypi.org/project/mathdom/
diff --git a/math/py-numexpr/pkg-descr b/math/py-numexpr/pkg-descr
index c2dab9851305..44042a93dc4e 100644
--- a/math/py-numexpr/pkg-descr
+++ b/math/py-numexpr/pkg-descr
@@ -13,5 +13,5 @@ transcendental functions (like trigonometrical, exponentials...) on top of
Intel-compatible platforms. This support also allows to use multiple cores in
your computations.
-WWW: https://pypi.python.org/pypi/numexpr
+WWW: https://pypi.org/project/numexpr/
WWW: https://github.com/pydata/numexpr
diff --git a/math/py-patsy/pkg-descr b/math/py-patsy/pkg-descr
index 9bde2ede2d91..186f6d6072b8 100644
--- a/math/py-patsy/pkg-descr
+++ b/math/py-patsy/pkg-descr
@@ -2,5 +2,5 @@ Patsy is a Python library for describing statistical models (especially linear
models, or models that have a linear component) and building design matrices.
Patsy brings the convenience of R "formulas" to Python.
-WWW: https://pypi.python.org/pypi/patsy
+WWW: https://pypi.org/project/patsy/
WWW: https://github.com/pydata/patsy
diff --git a/math/py-pyasp/pkg-descr b/math/py-pyasp/pkg-descr
index da8851340b39..b1faf75bad24 100644
--- a/math/py-pyasp/pkg-descr
+++ b/math/py-pyasp/pkg-descr
@@ -2,4 +2,4 @@ PyASP is a Python convenience wrapper allowing
to solve boolean satisfiability problems through
invocation of external commands 'clasp' and 'gringo'.
-WWW: https://pypi.python.org/pypi/pyasp
+WWW: https://pypi.org/project/pyasp/
diff --git a/math/py-pyhull/pkg-descr b/math/py-pyhull/pkg-descr
index 019f39586e9c..cd28a6fb9280 100644
--- a/math/py-pyhull/pkg-descr
+++ b/math/py-pyhull/pkg-descr
@@ -2,4 +2,4 @@ A Python wrapper to Qhull (www.qhull.org) for the computation
of the convex hull, Delaunay triangulation and Voronoi diagram.
WWW: https://github.com/materialsvirtuallab/pyhull
-WWW: https://pypi.python.org/pypi/pyhull
+WWW: https://pypi.org/project/pyhull/
diff --git a/math/py-pymc/pkg-descr b/math/py-pymc/pkg-descr
index 1826129c1e12..7776aa6e54ab 100644
--- a/math/py-pymc/pkg-descr
+++ b/math/py-pymc/pkg-descr
@@ -6,4 +6,4 @@ Metropolis-Hastings algorithm as a python class, and is extremely flexible and
applicable to a large suite of problems. pymc includes methods for summarizing
output, plotting, goodness-of-fit and convergence diagnostics.
-WWW: https://pypi.python.org/pypi/pymc
+WWW: https://pypi.org/project/pymc/
diff --git a/math/py-roman/pkg-descr b/math/py-roman/pkg-descr
index dc6fd3ae6d16..687b4a2fa619 100644
--- a/math/py-roman/pkg-descr
+++ b/math/py-roman/pkg-descr
@@ -1,3 +1,3 @@
This is a Integer to Roman numerals converter.
-WWW: https://pypi.python.org/pypi/roman
+WWW: https://pypi.org/project/roman/
diff --git a/misc/py-YABT/pkg-descr b/misc/py-YABT/pkg-descr
index ef5b4814f140..8640e5a0d671 100644
--- a/misc/py-YABT/pkg-descr
+++ b/misc/py-YABT/pkg-descr
@@ -10,4 +10,4 @@ Braille encoded in ASCII Braille, but tables for other
codes and other output encodings such as unicode Braille
are possible.
-WWW: https://pypi.python.org/pypi/YABT
+WWW: https://pypi.org/project/YABT/
diff --git a/misc/py-colorbrewer/pkg-descr b/misc/py-colorbrewer/pkg-descr
index 841d174515fc..03b7ec0e92f1 100644
--- a/misc/py-colorbrewer/pkg-descr
+++ b/misc/py-colorbrewer/pkg-descr
@@ -1,3 +1,3 @@
An easy way to get access to ColorBrewer schemes from within a Python program.
-WWW: https://pypi.python.org/pypi/colorbrewer
+WWW: https://pypi.org/project/colorbrewer/
diff --git a/misc/py-crudini/pkg-descr b/misc/py-crudini/pkg-descr
index d1f457a4e3b9..a52e65207b63 100644
--- a/misc/py-crudini/pkg-descr
+++ b/misc/py-crudini/pkg-descr
@@ -1,4 +1,4 @@
Crudini is the utility for handling ini files from the command line and
shell scripts.
-WWW: https://pypi.python.org/pypi/crudini
+WWW: https://pypi.org/project/crudini/
diff --git a/misc/py-fuzzy/pkg-descr b/misc/py-fuzzy/pkg-descr
index 2cb9190f3238..00655f2765f2 100644
--- a/misc/py-fuzzy/pkg-descr
+++ b/misc/py-fuzzy/pkg-descr
@@ -6,4 +6,4 @@ The algorithms are:
* Double Metaphone Based on Maurice Aubrey's C code from his perl
implementation.
-WWW: https://pypi.python.org/pypi/Fuzzy
+WWW: https://pypi.org/project/Fuzzy/
diff --git a/misc/py-progressbar/pkg-descr b/misc/py-progressbar/pkg-descr
index fe02d2798e8b..13472f371369 100644
--- a/misc/py-progressbar/pkg-descr
+++ b/misc/py-progressbar/pkg-descr
@@ -13,5 +13,5 @@ There are three types of widget:
- a ProgressBarWidgetHFill, which is like ProgressBarWidget, except
it expands to fill the remaining width of the line.
-WWW: https://pypi.python.org/pypi/progressbar
+WWW: https://pypi.org/project/progressbar/
WWW: https://github.com/niltonvolpato/python-progressbar
diff --git a/misc/py-progressbar2/pkg-descr b/misc/py-progressbar2/pkg-descr
index a034181ce99c..3e7a501ff24b 100644
--- a/misc/py-progressbar2/pkg-descr
+++ b/misc/py-progressbar2/pkg-descr
@@ -2,5 +2,5 @@ This library provides a text mode progressbar. This is typically
used to display the progress of a long running operation, providing
a visual clue that processing is underway.
-WWW: https://pypi.python.org/pypi/progressbar2
+WWW: https://pypi.org/project/progressbar2/
WWW: https://github.com/WoLpH/python-progressbar
diff --git a/misc/py-progressbar231/pkg-descr b/misc/py-progressbar231/pkg-descr
index 2b2cf048736f..bd9964d67b06 100644
--- a/misc/py-progressbar231/pkg-descr
+++ b/misc/py-progressbar231/pkg-descr
@@ -13,4 +13,4 @@ There are three types of widget:
- a ProgressBarWidgetHFill, which is like ProgressBarWidget, except
it expands to fill the remaining width of the line.
-WWW: https://pypi.python.org/pypi/progressbar231
+WWW: https://pypi.org/project/progressbar231/
diff --git a/misc/py-python-geohash/pkg-descr b/misc/py-python-geohash/pkg-descr
index bd6ba0ca547e..19558e2788b3 100644
--- a/misc/py-python-geohash/pkg-descr
+++ b/misc/py-python-geohash/pkg-descr
@@ -1,3 +1,3 @@
python-geohash is a fast, accurate python geohashing library.
-WWW: https://pypi.python.org/pypi/python-geohash
+WWW: https://pypi.org/project/python-geohash/
diff --git a/misc/py-python-utils/pkg-descr b/misc/py-python-utils/pkg-descr
index c2d90d9e6c9f..7d1d0ec16476 100644
--- a/misc/py-python-utils/pkg-descr
+++ b/misc/py-python-utils/pkg-descr
@@ -1,5 +1,5 @@
Python Utils is a collection of small Python functions and classes
which make common patterns shorter and easier.
-WWW: https://pypi.python.org/pypi/python-utils
+WWW: https://pypi.org/project/python-utils/
WWW: https://github.com/WoLpH/python-utils
diff --git a/misc/py-yolk/pkg-descr b/misc/py-yolk/pkg-descr
index fc5cb93bae66..7af1d0920afb 100644
--- a/misc/py-yolk/pkg-descr
+++ b/misc/py-yolk/pkg-descr
@@ -2,4 +2,4 @@ Yolk is a Python library and command-line tool for obtaining information
about packages installed by setuptools and packages on PyPI (Python Package
Index a.k.a. The Cheese Shop).
-WWW: https://pypi.python.org/pypi/yolk
+WWW: https://pypi.org/project/yolk/
diff --git a/multimedia/py-moviepy/pkg-descr b/multimedia/py-moviepy/pkg-descr
index bcdd78cc9506..774af60ffac8 100644
--- a/multimedia/py-moviepy/pkg-descr
+++ b/multimedia/py-moviepy/pkg-descr
@@ -5,5 +5,5 @@ creation of custom effects.
MoviePy can read and write all the most common audio and video formats,
including GIF.
-WWW: https://pypi.python.org/pypi/moviepy
+WWW: https://pypi.org/project/moviepy/
WWW: https://github.com/Zulko/moviepy
diff --git a/multimedia/py-tvnamer/pkg-descr b/multimedia/py-tvnamer/pkg-descr
index ffe2916170c1..14bcc875a10e 100644
--- a/multimedia/py-tvnamer/pkg-descr
+++ b/multimedia/py-tvnamer/pkg-descr
@@ -1,4 +1,4 @@
Automatically names downloaded/recorded TV-episodes, by parsing
filenames and retrieving show-names from www.thetvdb.com
-WWW: https://pypi.python.org/pypi/tvnamer
+WWW: https://pypi.org/project/tvnamer/
diff --git a/net-mgmt/py-adal/pkg-descr b/net-mgmt/py-adal/pkg-descr
index 4be8b44adf3a..6247f998477d 100644
--- a/net-mgmt/py-adal/pkg-descr
+++ b/net-mgmt/py-adal/pkg-descr
@@ -3,5 +3,5 @@ Microsoft Azure Active Directory Authentication Library (ADAL) for Python
The ADAL for python library makes it easy for python applications to
authenticate to AAD in order to access AAD protected web resources.
-WWW: https://pypi.python.org/pypi/adal
+WWW: https://pypi.org/project/adal/
WWW: https://github.com/AzureAD/azure-activedirectory-library-for-python
diff --git a/net-mgmt/py-ipcalc/pkg-descr b/net-mgmt/py-ipcalc/pkg-descr
index 3892f3dd1df9..a2355eb00210 100644
--- a/net-mgmt/py-ipcalc/pkg-descr
+++ b/net-mgmt/py-ipcalc/pkg-descr
@@ -1,4 +1,4 @@
This module allows you to perform IP subnet calculations, there is support for
both IPv4 and IPv6 CIDR notation.
-WWW: https://pypi.python.org/pypi/ipcalc
+WWW: https://pypi.org/project/ipcalc/
diff --git a/net-mgmt/py-ipy/pkg-descr b/net-mgmt/py-ipy/pkg-descr
index 3de0bb1c4cd6..897bf2f17ebc 100644
--- a/net-mgmt/py-ipy/pkg-descr
+++ b/net-mgmt/py-ipy/pkg-descr
@@ -3,4 +3,4 @@ a fashion similar to perl's Net::IP and friends. The IP class allows a
comfortable parsing and handling for most notations in use for IPv4 and IPv6
Addresses and Networks.
-WWW: https://pypi.python.org/pypi/IPy
+WWW: https://pypi.org/project/IPy/
diff --git a/net-mgmt/py-msrest/pkg-descr b/net-mgmt/py-msrest/pkg-descr
index b5f6d31cdab1..3f61055b04e2 100644
--- a/net-mgmt/py-msrest/pkg-descr
+++ b/net-mgmt/py-msrest/pkg-descr
@@ -1,4 +1,4 @@
The runtime library "msrest" for AutoRest generated Python clients.
-WWW: https://pypi.python.org/pypi/msrest
+WWW: https://pypi.org/project/msrest/
WWW: https://github.com/Azure/msrest-for-python
diff --git a/net-mgmt/py-msrestazure/pkg-descr b/net-mgmt/py-msrestazure/pkg-descr
index c6963c3eb071..1cf6ff85cea2 100644
--- a/net-mgmt/py-msrestazure/pkg-descr
+++ b/net-mgmt/py-msrestazure/pkg-descr
@@ -1,3 +1,3 @@
AutoRest swagger generator Python client runtime. Azure-specific module.
-WWW: https://pypi.python.org/pypi/msrestazure
+WWW: https://pypi.org/project/msrestazure/
diff --git a/net/py-coherence/pkg-descr b/net/py-coherence/pkg-descr
index 8e49a8307ed2..f3ded4e3b932 100644
--- a/net/py-coherence/pkg-descr
+++ b/net/py-coherence/pkg-descr
@@ -2,4 +2,4 @@ Coherence is a framework written in Python, providing a variety of UPnP
MediaServer and UPnP MediaRenderer implementations for instant use.
WWW: http://coherence-project.org
-WWW: https://pypi.python.org/pypi/Coherence
+WWW: https://pypi.org/project/Coherence/
diff --git a/net/py-cymruwhois/pkg-descr b/net/py-cymruwhois/pkg-descr
index 6de32ca3f5cf..1df522b17a8a 100644
--- a/net/py-cymruwhois/pkg-descr
+++ b/net/py-cymruwhois/pkg-descr
@@ -2,4 +2,4 @@ cymruwhois is a python library for interfacing with the
whois.cymru.com service and performs lookups by ip address and
return ASN, Country Code, and Netblock Owner.
-WWW: https://pypi.python.org/pypi/cymruwhois
+WWW: https://pypi.org/project/cymruwhois/
diff --git a/net/py-gspreadsheet/pkg-descr b/net/py-gspreadsheet/pkg-descr
index 6d3468eeaba2..6cf66363dc1c 100644
--- a/net/py-gspreadsheet/pkg-descr
+++ b/net/py-gspreadsheet/pkg-descr
@@ -7,5 +7,5 @@ can adapt your existing csv code to work with Google Spreadsheets with just two
line changes. As an added bonus, if you alter the dict, those changes get saved
back to the original spreadsheet.
-WWW: https://pypi.python.org/pypi/gspreadsheet
+WWW: https://pypi.org/project/gspreadsheet/
WWW: https://github.com/texastribune/gspreadsheet
diff --git a/net/py-haproxy-log-analysis/pkg-descr b/net/py-haproxy-log-analysis/pkg-descr
index 1a2c2fef8c43..7914b0d5b7e5 100644
--- a/net/py-haproxy-log-analysis/pkg-descr
+++ b/net/py-haproxy-log-analysis/pkg-descr
@@ -1,3 +1,3 @@
Haproxy log analyzer that tries to gives an insight of what's going on.
-WWW: https://pypi.python.org/pypi/haproxy_log_analysis
+WWW: https://pypi.org/project/haproxy_log_analysis/
diff --git a/net/py-ipaddress/pkg-descr b/net/py-ipaddress/pkg-descr
index 1ee9fc0155d3..06c887194f9a 100644
--- a/net/py-ipaddress/pkg-descr
+++ b/net/py-ipaddress/pkg-descr
@@ -3,5 +3,5 @@ Python 3.3's ipaddress (IPv4/IPv6 manipulation library) for Python 2.6 and 2.7.
Note that you must pass in unicode objects when constructing from a character
representation!
-WWW: https://pypi.python.org/pypi/ipaddress
+WWW: https://pypi.org/project/ipaddress/
WWW: https://github.com/phihag/ipaddress
diff --git a/net/py-iplib/pkg-descr b/net/py-iplib/pkg-descr
index 306d4e3db9a8..e8ce8123ba3a 100644
--- a/net/py-iplib/pkg-descr
+++ b/net/py-iplib/pkg-descr
@@ -2,4 +2,4 @@ You can use this Python module to convert amongst many different
notations and to manage couples of address/netmask in the CIDR
notation.
-WWW: https://pypi.python.org/pypi/iplib
+WWW: https://pypi.org/project/iplib/
diff --git a/net/py-matrix-synapse-ldap3/pkg-descr b/net/py-matrix-synapse-ldap3/pkg-descr
index a8eac0f6a41b..e84947f84c00 100644
--- a/net/py-matrix-synapse-ldap3/pkg-descr
+++ b/net/py-matrix-synapse-ldap3/pkg-descr
@@ -1,3 +1,3 @@
Allows synapse to use LDAP as a password provider.
-WWW: https://pypi.python.org/pypi/matrix-synapse-ldap3
+WWW: https://pypi.org/project/matrix-synapse-ldap3/
diff --git a/net/py-ndg_httpsclient/pkg-descr b/net/py-ndg_httpsclient/pkg-descr
index 1f5d5529436e..e8c18dcdf9e0 100644
--- a/net/py-ndg_httpsclient/pkg-descr
+++ b/net/py-ndg_httpsclient/pkg-descr
@@ -1,5 +1,5 @@
This is a HTTPS client implementation for httplib and urllib2 based on
PyOpenSSL.
-WWW: https://pypi.python.org/pypi/ndg-httpsclient
+WWW: https://pypi.org/project/ndg-httpsclient/
WWW: https://github.com/cedadev/ndg_httpsclient
diff --git a/net/py-netifaces/pkg-descr b/net/py-netifaces/pkg-descr
index 198cf3a29379..f8a48d6b5e46 100644
--- a/net/py-netifaces/pkg-descr
+++ b/net/py-netifaces/pkg-descr
@@ -4,4 +4,4 @@ It's been irritating me for ages that it isn't possible to
straightforwardly get the network address(es) of the machine
you're running on from a Python program.
-WWW: https://pypi.python.org/pypi/netifaces
+WWW: https://pypi.org/project/netifaces/
diff --git a/net/py-netlib/pkg-descr b/net/py-netlib/pkg-descr
index 4574359a8312..15c19c985a41 100644
--- a/net/py-netlib/pkg-descr
+++ b/net/py-netlib/pkg-descr
@@ -5,4 +5,4 @@ It differs from other projects in some fundamental
respects, because both pathod and mitmproxy often
need to violate standards.
-WWW: https://pypi.python.org/pypi/netlib
+WWW: https://pypi.org/project/netlib/
diff --git a/net/py-netsnmpagent/pkg-descr b/net/py-netsnmpagent/pkg-descr
index a48e12ba4798..1fdbaa36df4d 100644
--- a/net/py-netsnmpagent/pkg-descr
+++ b/net/py-netsnmpagent/pkg-descr
@@ -7,4 +7,4 @@ the local node MIB tree. Usually, this requires writing a MIB as well, ie.
a text file that specifies the structure, names and data types of the
information within the MIB module.
-WWW: https://pypi.python.org/pypi/netsnmpagent
+WWW: https://pypi.org/project/netsnmpagent/
diff --git a/net/py-ntplib/pkg-descr b/net/py-ntplib/pkg-descr
index 883fb471dc88..2c6378e070cc 100644
--- a/net/py-ntplib/pkg-descr
+++ b/net/py-ntplib/pkg-descr
@@ -6,4 +6,4 @@ fields values to text (mode, leap indicator...). Since
it's pure Python, and only depends on core modules,
it should work on any platform with a Python implementation.
-WWW: https://pypi.python.org/pypi/ntplib
+WWW: https://pypi.org/project/ntplib/
diff --git a/net/py-oauth/pkg-descr b/net/py-oauth/pkg-descr
index b12da377b8b2..c0bf14887f5f 100644
--- a/net/py-oauth/pkg-descr
+++ b/net/py-oauth/pkg-descr
@@ -2,4 +2,4 @@ py-oauth is a python libarary for OAuth. OAuth is an open
protocol to allow API authentication in a simple and standard
method from desktop and web applications.
-WWW: https://pypi.python.org/pypi/oauth
+WWW: https://pypi.org/project/oauth/
diff --git a/net/py-pyshark/pkg-descr b/net/py-pyshark/pkg-descr
index 8a4e1d031f7a..15133f24f9d8 100644
--- a/net/py-pyshark/pkg-descr
+++ b/net/py-pyshark/pkg-descr
@@ -1,4 +1,4 @@
Python wrapper for tshark, allowing python packet parsing using
wireshark dissectors.
-WWW: https://pypi.python.org/pypi/pyshark
+WWW: https://pypi.org/project/pyshark/
diff --git a/net/py-pystun/pkg-descr b/net/py-pystun/pkg-descr
index d2dbf507ac00..05923e275d2c 100644
--- a/net/py-pystun/pkg-descr
+++ b/net/py-pystun/pkg-descr
@@ -1,3 +1,3 @@
A Python STUN client for getting NAT type and external IP.
-WWW: https://pypi.python.org/pypi/pystun
+WWW: https://pypi.org/project/pystun/
diff --git a/net/py-python-barbicanclient/pkg-descr b/net/py-python-barbicanclient/pkg-descr
index d11eee397073..6d0e252034d3 100644
--- a/net/py-python-barbicanclient/pkg-descr
+++ b/net/py-python-barbicanclient/pkg-descr
@@ -2,4 +2,4 @@ This is a client for the Barbican Key Management API. There is a Python
library for accessing the API (barbicanclient module), and a command-line
script (barbican).
-WWW: https://pypi.python.org/pypi/python-barbicanclient
+WWW: https://pypi.org/project/python-barbicanclient/
diff --git a/net/py-python-ceilometerclient/pkg-descr b/net/py-python-ceilometerclient/pkg-descr
index 26a965594063..b9c9c2ff1ae0 100644
--- a/net/py-python-ceilometerclient/pkg-descr
+++ b/net/py-python-ceilometerclient/pkg-descr
@@ -2,4 +2,4 @@ This is a client library for Ceilometer built on the Ceilometer API. It
provides a Python API (the ceilometerclient module) and a command-line tool
(ceilometer).
-WWW: https://pypi.python.org/pypi/python-ceilometerclient
+WWW: https://pypi.org/project/python-ceilometerclient/
diff --git a/net/py-python-cinderclient/pkg-descr b/net/py-python-cinderclient/pkg-descr
index 00824e0531ae..f97f25c207bb 100644
--- a/net/py-python-cinderclient/pkg-descr
+++ b/net/py-python-cinderclient/pkg-descr
@@ -2,4 +2,4 @@ This is a client for the OpenStack Cinder API. There's a Python
API (the cinderclient module), and a command-line script (cinder).
Each implements 100% of the OpenStack Cinder API.
-WWW: https://pypi.python.org/pypi/python-cinderclient
+WWW: https://pypi.org/project/python-cinderclient/
diff --git a/net/py-python-designateclient/pkg-descr b/net/py-python-designateclient/pkg-descr
index 71af780d64d8..f3a2cf9c93ed 100644
--- a/net/py-python-designateclient/pkg-descr
+++ b/net/py-python-designateclient/pkg-descr
@@ -1,4 +1,4 @@
This is a client library for Designate built on the Designate API. It provides
a Python API (the designateclient module) and a command-line tool (designate).
-WWW: https://pypi.python.org/pypi/python-designateclient
+WWW: https://pypi.org/project/python-designateclient/
diff --git a/net/py-python-glanceclient/pkg-descr b/net/py-python-glanceclient/pkg-descr
index 74510513ee8e..df18385d60f2 100644
--- a/net/py-python-glanceclient/pkg-descr
+++ b/net/py-python-glanceclient/pkg-descr
@@ -2,4 +2,4 @@ This is a client for the OpenStack Glance API. There's a Python
API (the glanceclient module), and a command-line script (glance).
Each implements 100% of the OpenStack Glance API.
-WWW: https://pypi.python.org/pypi/python-glanceclient
+WWW: https://pypi.org/project/python-glanceclient/
diff --git a/net/py-python-heatclient/pkg-descr b/net/py-python-heatclient/pkg-descr
index d640c8e35dd4..bc0b6e11643e 100644
--- a/net/py-python-heatclient/pkg-descr
+++ b/net/py-python-heatclient/pkg-descr
@@ -1,4 +1,4 @@
This is a client library for Heat built on the Heat orchestration API. It
provides a Python API (the heatclient module) and a command-line tool (heat).
-WWW: https://pypi.python.org/pypi/python-heatclient
+WWW: https://pypi.org/project/python-heatclient/
diff --git a/net/py-python-keystoneclient/pkg-descr b/net/py-python-keystoneclient/pkg-descr
index a03f4c600828..4ac3462001b8 100644
--- a/net/py-python-keystoneclient/pkg-descr
+++ b/net/py-python-keystoneclient/pkg-descr
@@ -2,4 +2,4 @@ A client for the OpenStack Identity API, implemented by the Keystone team.
It contains a Python API (the keystoneclient module) for
OpenStack's Identity Service.
-WWW: https://pypi.python.org/pypi/python-keystoneclient
+WWW: https://pypi.org/project/python-keystoneclient/
diff --git a/net/py-python-neutronclient/pkg-descr b/net/py-python-neutronclient/pkg-descr
index 4b9c562515c2..fb0ef4f04266 100644
--- a/net/py-python-neutronclient/pkg-descr
+++ b/net/py-python-neutronclient/pkg-descr
@@ -2,4 +2,4 @@ This is a client for the OpenStack Neutron API. There's a Python
API (the neutronclient module), and a command-line script (neutron).
Each implements 100% of the OpenStack Neutron API.
-WWW: https://pypi.python.org/pypi/python-neutronclient
+WWW: https://pypi.org/project/python-neutronclient/
diff --git a/net/py-python-ntlm/pkg-descr b/net/py-python-ntlm/pkg-descr
index c6a32339a0af..9e631abf861e 100644
--- a/net/py-python-ntlm/pkg-descr
+++ b/net/py-python-ntlm/pkg-descr
@@ -2,4 +2,4 @@ Python library that provides NTLM support, including an authentication
handler for urllib2. Works with pass-the-hash in additon to password
authentication.
-WWW: https://pypi.python.org/pypi/python-ntlm
+WWW: https://pypi.org/project/python-ntlm/
diff --git a/net/py-python-openstackclient/pkg-descr b/net/py-python-openstackclient/pkg-descr
index 55a72971ebeb..6dbb90a236e5 100644
--- a/net/py-python-openstackclient/pkg-descr
+++ b/net/py-python-openstackclient/pkg-descr
@@ -3,4 +3,4 @@ that brings the command set for Compute, Identity, Image,
Object Store and Block Storage APIs together in a single shell
with a uniform command structure.
-WWW: https://pypi.python.org/pypi/python-openstackclient
+WWW: https://pypi.org/project/python-openstackclient/
diff --git a/net/py-smart_open/pkg-descr b/net/py-smart_open/pkg-descr
index dd29fed524a3..fa2c529ebdf1 100644
--- a/net/py-smart_open/pkg-descr
+++ b/net/py-smart_open/pkg-descr
@@ -2,5 +2,5 @@ smart_open is a Python 2 & Python 3 library for efficient streaming of very
large files from/to S3, HDFS, WebHDFS, HTTP, or local (compressed) files. It is
well tested (using moto), well documented and sports a simple, Pythonic API.
-WWW: https://pypi.python.org/pypi/smart_open
+WWW: https://pypi.org/project/smart_open/
WWW: https://github.com/RaRe-Technologies/smart_open
diff --git a/net/py-soap2py/pkg-descr b/net/py-soap2py/pkg-descr
index 222a313d766b..880273ca9862 100644
--- a/net/py-soap2py/pkg-descr
+++ b/net/py-soap2py/pkg-descr
@@ -18,5 +18,5 @@ Goals:
- Extensible: supports several HTTP wrappers (httplib2, pycurl, urllib2) for
special transport needs over SSL and proxy (ISA)
-WWW: https://pypi.python.org/pypi/soap2py
+WWW: https://pypi.org/project/soap2py/
WWW: https://github.com/pysimplesoap/pysimplesoap
diff --git a/net/py-suds-jurko/pkg-descr b/net/py-suds-jurko/pkg-descr
index 792ef848ff5b..898b522cf810 100644
--- a/net/py-suds-jurko/pkg-descr
+++ b/net/py-suds-jurko/pkg-descr
@@ -1,3 +1,3 @@
Lightweight SOAP client written in Python (jurko's fork).
-WWW: https://pypi.python.org/pypi/suds-jurko
+WWW: https://pypi.org/project/suds-jurko/
diff --git a/net/py-txamqp/pkg-descr b/net/py-txamqp/pkg-descr
index 5ef2f3bc4033..542d9aff7cb4 100644
--- a/net/py-txamqp/pkg-descr
+++ b/net/py-txamqp/pkg-descr
@@ -3,4 +3,4 @@ messages to/from an AMQP-compliant peer or broker (Qpid, OpenAMQ, RabbitMQ)
using Twisted. It also includes support for using Thrift RPC over AMQP in
Twisted applications.
-WWW: https://pypi.python.org/pypi/txAMQP
+WWW: https://pypi.org/project/txAMQP/
diff --git a/net/py-txrestapi/pkg-descr b/net/py-txrestapi/pkg-descr
index b4d3b3cbc982..b35563abc96d 100644
--- a/net/py-txrestapi/pkg-descr
+++ b/net/py-txrestapi/pkg-descr
@@ -5,4 +5,4 @@ readable. txrestapi provides an APIResource class allowing complex
mapping of path to callback (a la Django) with a readable decorator.
-WWW: https://pypi.python.org/pypi/txrestapi
+WWW: https://pypi.org/project/txrestapi/
diff --git a/net/py-urllib3/pkg-descr b/net/py-urllib3/pkg-descr
index 826f9b78b36b..fcde6b2d7984 100644
--- a/net/py-urllib3/pkg-descr
+++ b/net/py-urllib3/pkg-descr
@@ -10,4 +10,4 @@ critical features that are missing from the Python standard libraries:
- Proxy support for HTTP and SOCKS.
- 100% test coverage.
-WWW: https://pypi.python.org/pypi/urllib3
+WWW: https://pypi.org/project/urllib3/
diff --git a/net/py-zope.proxy/pkg-descr b/net/py-zope.proxy/pkg-descr
index 5460d38579b7..765c6e659914 100644
--- a/net/py-zope.proxy/pkg-descr
+++ b/net/py-zope.proxy/pkg-descr
@@ -3,4 +3,4 @@ around another object, intervening in the apparent behavior of the
wrapped object only when necessary to apply the policy (e.g., access
checking, location brokering, etc.) for which the proxy is responsible.
-WWW: https://pypi.python.org/pypi/zope.proxy
+WWW: https://pypi.org/project/zope.proxy/
diff --git a/net/pyrad/pkg-descr b/net/pyrad/pkg-descr
index d10a9e9e39fb..439c0ef41340 100644
--- a/net/pyrad/pkg-descr
+++ b/net/pyrad/pkg-descr
@@ -2,4 +2,4 @@ pyrad is a Python implementation of a RADIUS client as described in RFC2865.
It takes care of all the details like building RADIUS packets, sending them
and decoding responses.
-WWW: https://pypi.python.org/pypi/pyrad
+WWW: https://pypi.org/project/pyrad/
diff --git a/news/py-pynzb/pkg-descr b/news/py-pynzb/pkg-descr
index b31b63c0d05e..07625f80d801 100644
--- a/news/py-pynzb/pkg-descr
+++ b/news/py-pynzb/pkg-descr
@@ -5,4 +5,4 @@ Since NZB is XML-based, it's relatively easy to build one-off parsers
to parse NZB files. This project is an attempt to consolidate those
many one-off NZB parsers into one simple interface.
-WWW: https://pypi.python.org/pypi/pynzb
+WWW: https://pypi.org/project/pynzb/
diff --git a/print/py-pycups/pkg-descr b/print/py-pycups/pkg-descr
index a40edfb59895..2eddade839a7 100644
--- a/print/py-pycups/pkg-descr
+++ b/print/py-pycups/pkg-descr
@@ -1,4 +1,4 @@
CUPS bindings for Python
-WWW: https://pypi.python.org/pypi/pycups
+WWW: https://pypi.org/project/pycups/
WWW: http://cyberelk.net/tim/software/pycups/
diff --git a/print/py-relatorio/pkg-descr b/print/py-relatorio/pkg-descr
index e09ef14f113b..31b068c6b976 100644
--- a/print/py-relatorio/pkg-descr
+++ b/print/py-relatorio/pkg-descr
@@ -5,4 +5,4 @@ relatorio also provides a report repository allowing you to link python
objects and report together, find reports by mimetypes/name/python
objects.
-WWW: https://pypi.python.org/pypi/relatorio
+WWW: https://pypi.org/project/relatorio/
diff --git a/science/py-cdo/pkg-descr b/science/py-cdo/pkg-descr
index 8a5d5c1b468f..2bd2fb226776 100644
--- a/science/py-cdo/pkg-descr
+++ b/science/py-cdo/pkg-descr
@@ -1,5 +1,5 @@
Python binding to CDO (Climate Data Operators)
-WWW: https://pypi.python.org/pypi/cdo
+WWW: https://pypi.org/project/cdo/
WWW: https://code.mpimet.mpg.de/projects/cdo/wiki/Cdo%7Brbpy%7D
WWW: https://github.com/Try2Code/cdo-bindings
diff --git a/science/py-coards/pkg-descr b/science/py-coards/pkg-descr
index eb862a4ac39a..0df7bf64dce4 100644
--- a/science/py-coards/pkg-descr
+++ b/science/py-coards/pkg-descr
@@ -1,3 +1,3 @@
Coards is a parser for time values represented using the COARDS convention.
-WWW: https://pypi.python.org/pypi/coards
+WWW: https://pypi.org/project/coards/
diff --git a/science/py-h5py/pkg-descr b/science/py-h5py/pkg-descr
index 2f375d99dd0e..63263f5b4c2d 100644
--- a/science/py-h5py/pkg-descr
+++ b/science/py-h5py/pkg-descr
@@ -8,5 +8,5 @@ data structures and their HDF5 equivalents vastly simplifies the process of
reading and writing data from Python.
WWW: https://www.h5py.org/
-WWW: https://pypi.python.org/pypi/h5py
+WWW: https://pypi.org/project/h5py/
WWW: https://github.com/h5py/h5py
diff --git a/science/py-pupynere/pkg-descr b/science/py-pupynere/pkg-descr
index 1925cf2bc79a..b560aa37ea11 100644
--- a/science/py-pupynere/pkg-descr
+++ b/science/py-pupynere/pkg-descr
@@ -2,5 +2,5 @@ Pupynere is a Python module for reading and writing NetCDF files, using the same
API as Scientific.IO.NetCDF and pynetcdf. It depends only on Numpy, so you don't
need to have the NetCDF library installed.
-WWW: https://pypi.python.org/pypi/pupynere
+WWW: https://pypi.org/project/pupynere/
WWW: https://bitbucket.org/robertodealmeida/pupynere
diff --git a/science/py-pyaixi/pkg-descr b/science/py-pyaixi/pkg-descr
index f46ae0426302..7d2b6dcec502 100644
--- a/science/py-pyaixi/pkg-descr
+++ b/science/py-pyaixi/pkg-descr
@@ -5,5 +5,5 @@ This is an approximation of the AIXI universal artificial intelligence
algorithm, which describes a model-based, reinforcement-learning agent capable
of general learning.
-WWW: https://pypi.python.org/pypi/pyaixi
+WWW: https://pypi.org/project/pyaixi/
WWW: https://github.com/gkassel/pyaixi
diff --git a/science/py-pysal/pkg-descr b/science/py-pysal/pkg-descr
index 75335ef28b95..f31b9b580dcf 100644
--- a/science/py-pysal/pkg-descr
+++ b/science/py-pysal/pkg-descr
@@ -2,5 +2,5 @@ PySAL is a cross-platform library of spatial analysis functions written in
Python. It is intended to support the development of high level applications for
spatial analysis.
-WWW: https://pypi.python.org/pypi/PySAL
+WWW: https://pypi.org/project/PySAL/
WWW: http://pysal.org/
diff --git a/science/py-pyteomics.biolccc/pkg-descr b/science/py-pyteomics.biolccc/pkg-descr
index 56dede7bbbcb..64366b833713 100644
--- a/science/py-pyteomics.biolccc/pkg-descr
+++ b/science/py-pyteomics.biolccc/pkg-descr
@@ -5,4 +5,4 @@ Conditions).
pyteomics.biolccc is set of Python wrappings around libBioLCCC.
-WWW: https://pypi.python.org/pypi/pyteomics.biolccc
+WWW: https://pypi.org/project/pyteomics.biolccc/
diff --git a/science/py-pyteomics/pkg-descr b/science/py-pyteomics/pkg-descr
index f30cbd1b1687..d7f443c1cba4 100644
--- a/science/py-pyteomics/pkg-descr
+++ b/science/py-pyteomics/pkg-descr
@@ -13,4 +13,4 @@ tasks in proteomics data analysis, such as:
. search engines output
* easy manipulation of sequences of modified peptides and proteins
-WWW: https://pypi.python.org/pypi/pyteomics
+WWW: https://pypi.org/project/pyteomics/
diff --git a/science/py-scimath/pkg-descr b/science/py-scimath/pkg-descr
index b6c9445ce2bc..7de815f02e05 100644
--- a/science/py-scimath/pkg-descr
+++ b/science/py-scimath/pkg-descr
@@ -4,4 +4,4 @@ mathematical calculations, beyond the capabilities offered by SciPy.
* enthought.mathematics
* enthought.units
-WWW: https://pypi.python.org/pypi/SciMath
+WWW: https://pypi.org/project/scimath/
diff --git a/security/pssh/pkg-descr b/security/pssh/pkg-descr
index 83ea7434fe87..025a8ee51fe4 100644
--- a/security/pssh/pkg-descr
+++ b/security/pssh/pkg-descr
@@ -10,4 +10,4 @@ in the distribution:
What are these tools good for? Mainly for controlling large collections
of nodes in the wide-area.
-WWW: https://pypi.python.org/pypi/pssh
+WWW: https://pypi.org/project/pssh/
diff --git a/security/py-AccessControl/pkg-descr b/security/py-AccessControl/pkg-descr
index 312856e5e888..6c367df401fd 100644
--- a/security/py-AccessControl/pkg-descr
+++ b/security/py-AccessControl/pkg-descr
@@ -1,3 +1,3 @@
AccessControl provides a general security framework for use in Zope2.
-WWW: https://pypi.python.org/pypi/AccessControl
+WWW: https://pypi.org/project/AccessControl/
diff --git a/security/py-Products.PlonePAS/pkg-descr b/security/py-Products.PlonePAS/pkg-descr
index 43162a49113f..f3caf6d14fec 100644
--- a/security/py-Products.PlonePAS/pkg-descr
+++ b/security/py-Products.PlonePAS/pkg-descr
@@ -1,3 +1,3 @@
PlonePAS adapts the PluggableAuthService for use by Plone.
-WWW: https://pypi.python.org/pypi/Products.PlonePAS
+WWW: https://pypi.org/project/Products.PlonePAS/
diff --git a/security/py-Products.PluggableAuthService/pkg-descr b/security/py-Products.PluggableAuthService/pkg-descr
index 93f60203276e..a084927ced1f 100644
--- a/security/py-Products.PluggableAuthService/pkg-descr
+++ b/security/py-Products.PluggableAuthService/pkg-descr
@@ -1,3 +1,3 @@
Pluggable Zope2 authentication / authorization framework.
-WWW: https://pypi.python.org/pypi/Products.PluggableAuthService
+WWW: https://pypi.org/project/Products.PluggableAuthService/
diff --git a/security/py-RestrictedPython/pkg-descr b/security/py-RestrictedPython/pkg-descr
index 7550dbc74d53..6485b414f7e6 100644
--- a/security/py-RestrictedPython/pkg-descr
+++ b/security/py-RestrictedPython/pkg-descr
@@ -1,4 +1,4 @@
RestrictedPython provides a restricted execution environment for Python,
e.g. for running untrusted code.
-WWW: https://pypi.python.org/pypi/RestrictedPython
+WWW: https://pypi.org/project/RestrictedPython/
diff --git a/security/py-SecretStorage/pkg-descr b/security/py-SecretStorage/pkg-descr
index a7afc2606d6b..c83505141206 100644
--- a/security/py-SecretStorage/pkg-descr
+++ b/security/py-SecretStorage/pkg-descr
@@ -7,4 +7,4 @@ KWallet (>= 4.8).
It allows to create new passwords, delete and search for passwords matching
given attributes. It also supports graphical prompts when unlocking is needed.
-WWW: https://pypi.python.org/pypi/SecretStorage
+WWW: https://pypi.org/project/SecretStorage/
diff --git a/security/py-YubiOTP/pkg-descr b/security/py-YubiOTP/pkg-descr
index 4fecf3a0031f..101a5b6d0ed8 100644
--- a/security/py-YubiOTP/pkg-descr
+++ b/security/py-YubiOTP/pkg-descr
@@ -4,4 +4,4 @@ versions of the Yubico validation web service. The primary audience is
developers who wish to verify YubiKey tokens in their applications, presumably
as part of a multi-factor authentication scheme.
-WWW: https://pypi.python.org/pypi/YubiOTP
+WWW: https://pypi.org/project/YubiOTP/
diff --git a/security/py-borg.localrole/pkg-descr b/security/py-borg.localrole/pkg-descr
index 29e3893ba102..e9dffffc646d 100644
--- a/security/py-borg.localrole/pkg-descr
+++ b/security/py-borg.localrole/pkg-descr
@@ -1,4 +1,4 @@
A PAS plugin which can manage local roles via an adapter lookup
on the current context.
-WWW: https://pypi.python.org/pypi/borg.localrole
+WWW: https://pypi.org/project/borg.localrole/
diff --git a/security/py-certifi/pkg-descr b/security/py-certifi/pkg-descr
index 9ca40d38547c..599cdd3f4319 100644
--- a/security/py-certifi/pkg-descr
+++ b/security/py-certifi/pkg-descr
@@ -1,3 +1,3 @@
Certifi: Python Mozilla's SSL Certificates.
-WWW: https://pypi.python.org/pypi/certifi
+WWW: https://pypi.org/project/certifi/
diff --git a/security/py-gnutls/pkg-descr b/security/py-gnutls/pkg-descr
index 90c51cceb42a..30d0747d2815 100644
--- a/security/py-gnutls/pkg-descr
+++ b/security/py-gnutls/pkg-descr
@@ -14,4 +14,4 @@ made available via ctypes. This makes the wrapper very powerful and flexible
as it has direct access to all the GNUTLS internals and is also very easy to
extend without any need to write C code or recompile anything.
-WWW: https://pypi.python.org/pypi/python-gnutls
+WWW: https://pypi.org/project/python-gnutls/
diff --git a/security/py-google-auth/pkg-descr b/security/py-google-auth/pkg-descr
index b326679ed878..09befadc40f1 100644
--- a/security/py-google-auth/pkg-descr
+++ b/security/py-google-auth/pkg-descr
@@ -9,5 +9,5 @@ also provides integration with several HTTP libraries.
- Support for Google App Engine standard credentials.
- Support for various transports, including Requests, urllib3, and gRPC.
-WWW: https://pypi.python.org/pypi/google-auth
+WWW: https://pypi.org/project/google-auth/
WWW: https://github.com/GoogleCloudPlatform/google-auth-library-python
diff --git a/security/py-halberd/pkg-descr b/security/py-halberd/pkg-descr
index 66bc9588c876..cc39abf1eda4 100644
--- a/security/py-halberd/pkg-descr
+++ b/security/py-halberd/pkg-descr
@@ -2,4 +2,4 @@ Halberd discovers HTTP load balancers. It is useful for web
application security auditing and for load balancer configuration
testing.
-WWW: https://pypi.python.org/pypi/halberd
+WWW: https://pypi.org/project/halberd/
diff --git a/security/py-keyrings.alt/pkg-descr b/security/py-keyrings.alt/pkg-descr
index 957fe4854354..accbedae4435 100644
--- a/security/py-keyrings.alt/pkg-descr
+++ b/security/py-keyrings.alt/pkg-descr
@@ -1,4 +1,4 @@
Alternate keyring backend implementations for use with the Python keyring
package.
-WWW: https://pypi.python.org/pypi/keyrings.alt
+WWW: https://pypi.org/project/keyrings.alt/
diff --git a/security/py-m2crypto/pkg-descr b/security/py-m2crypto/pkg-descr
index 1cebbe8da839..d973ef18b329 100644
--- a/security/py-m2crypto/pkg-descr
+++ b/security/py-m2crypto/pkg-descr
@@ -5,5 +5,5 @@ xmlrpclib; unforgeable HMAC'ing AuthCookies for web session management; FTP/TLS
client and server; S/MIME; ZServerSSL: A HTTPS server for Zope and ZSmime: An
S/MIME messenger for Zope.
-WWW: https://pypi.python.org/pypi/M2Crypto
+WWW: https://pypi.org/project/M2Crypto/
WWW: https://gitlab.com/m2crypto/m2crypto
diff --git a/security/py-oauth2client/pkg-descr b/security/py-oauth2client/pkg-descr
index 421f01fb1ece..d940e1098db3 100644
--- a/security/py-oauth2client/pkg-descr
+++ b/security/py-oauth2client/pkg-descr
@@ -2,5 +2,5 @@ oauth2client is a Python module for client-side oauth2 authentication. It works
with Google's oauth2 service by default, and is compatible with any oauth2
service.
-WWW: https://pypi.python.org/pypi/oauth2client
+WWW: https://pypi.org/project/oauth2client/
WWW: http://google.github.io/oauth2client/
diff --git a/security/py-pgpdump/pkg-descr b/security/py-pgpdump/pkg-descr
index 48648fcaa3c3..1fad2ac7203a 100644
--- a/security/py-pgpdump/pkg-descr
+++ b/security/py-pgpdump/pkg-descr
@@ -1,3 +1,3 @@
A Python library for parsing PGP packets
-WWW: https://pypi.python.org/pypi/pgpdump
+WWW: https://pypi.org/project/pgpdump/
diff --git a/security/py-plone.app.openid/pkg-descr b/security/py-plone.app.openid/pkg-descr
index 95a44dae317f..969efd1e110f 100644
--- a/security/py-plone.app.openid/pkg-descr
+++ b/security/py-plone.app.openid/pkg-descr
@@ -1,3 +1,3 @@
Plone OpenID authentication support.
-WWW: https://pypi.python.org/pypi/plone.app.openid
+WWW: https://pypi.org/project/plone.app.openid/
diff --git a/security/py-plone.keyring/pkg-descr b/security/py-plone.keyring/pkg-descr
index 320a657b9c7d..bcf01023990f 100644
--- a/security/py-plone.keyring/pkg-descr
+++ b/security/py-plone.keyring/pkg-descr
@@ -1,3 +1,3 @@
Manage secrets.
-WWW: https://pypi.python.org/pypi/plone.keyring
+WWW: https://pypi.org/project/plone.keyring/
diff --git a/security/py-plone.openid/pkg-descr b/security/py-plone.openid/pkg-descr
index 9b4d8cb806fc..2c4606896d6e 100644
--- a/security/py-plone.openid/pkg-descr
+++ b/security/py-plone.openid/pkg-descr
@@ -1,3 +1,3 @@
OpenID authentication support for PAS.
-WWW: https://pypi.python.org/pypi/plone.openid
+WWW: https://pypi.org/project/plone.openid/
diff --git a/security/py-plone.protect/pkg-descr b/security/py-plone.protect/pkg-descr
index 2d38f2674536..aded0a12dfb1 100644
--- a/security/py-plone.protect/pkg-descr
+++ b/security/py-plone.protect/pkg-descr
@@ -1,3 +1,3 @@
Security for browser forms.
-WWW: https://pypi.python.org/pypi/plone.protect
+WWW: https://pypi.org/project/plone.protect/
diff --git a/security/py-plone.session/pkg-descr b/security/py-plone.session/pkg-descr
index 04250578a983..f71ceb6631a1 100644
--- a/security/py-plone.session/pkg-descr
+++ b/security/py-plone.session/pkg-descr
@@ -1,3 +1,3 @@
Session based authentication for Zope.
-WWW: https://pypi.python.org/pypi/plone.session
+WWW: https://pypi.org/project/plone.session/
diff --git a/security/py-pynacl/pkg-descr b/security/py-pynacl/pkg-descr
index 287a3e4a62ae..80ecc05547dd 100644
--- a/security/py-pynacl/pkg-descr
+++ b/security/py-pynacl/pkg-descr
@@ -1,4 +1,4 @@
PyNaCl is a Python binding to the Networking and Cryptography library, a crypto
library with the stated goal of improving usability, security and speed.
-WWW: https://pypi.python.org/pypi/PyNaCl
+WWW: https://pypi.org/project/PyNaCl/
diff --git a/security/py-python3-openid/pkg-descr b/security/py-python3-openid/pkg-descr
index 172a4394fc04..29a2808a4550 100644
--- a/security/py-python3-openid/pkg-descr
+++ b/security/py-python3-openid/pkg-descr
@@ -4,5 +4,5 @@ sign-on for your web site? Use the openid.consumer package. Want to run your own
OpenID server? Check out openid.server. Includes example code and support for a
variety of storage back-ends.
-WWW: https://pypi.python.org/pypi/python3-openid
+WWW: https://pypi.org/project/python3-openid/
WWW: https://github.com/necaris/python3-openid
diff --git a/security/py-safe/pkg-descr b/security/py-safe/pkg-descr
index a1df76a94cbe..eddd09108c78 100644
--- a/security/py-safe/pkg-descr
+++ b/security/py-safe/pkg-descr
@@ -1,4 +1,4 @@
Is your password safe?
Safe will check the password strength for you.
-WWW: https://pypi.python.org/pypi/Safe
+WWW: https://pypi.org/project/Safe/
diff --git a/security/py-scrypt/pkg-descr b/security/py-scrypt/pkg-descr
index ddd3322d9ce8..d338e7fe1e59 100644
--- a/security/py-scrypt/pkg-descr
+++ b/security/py-scrypt/pkg-descr
@@ -8,4 +8,4 @@ will take a considerable amount of time. This is in contrast to more
traditional hash functions such as MD5 or the SHA family which can be
implemented extremely fast on cheap hardware.
-WWW: https://pypi.python.org/pypi/scrypt
+WWW: https://pypi.org/project/scrypt/
diff --git a/security/py-ssh/pkg-descr b/security/py-ssh/pkg-descr
index 7997688c969a..522df45ada1d 100644
--- a/security/py-ssh/pkg-descr
+++ b/security/py-ssh/pkg-descr
@@ -3,4 +3,4 @@ on using SSH2 as an alternative to SSL for making secure connections between
python scripts. All major ciphers and hash methods are supported. SFTP client
and server mode are both supported too.
-WWW: https://pypi.python.org/pypi/ssh
+WWW: https://pypi.org/project/ssh/
diff --git a/security/py-virustotal-api/pkg-descr b/security/py-virustotal-api/pkg-descr
index b6bd9c70b906..a9d3ed8938b9 100644
--- a/security/py-virustotal-api/pkg-descr
+++ b/security/py-virustotal-api/pkg-descr
@@ -4,4 +4,4 @@ without the need of using the HTML website interface. In other words, it
allows you to build simple scripts to access the information generated by
VirusTotal.
-WWW: https://pypi.python.org/pypi/virustotal-api
+WWW: https://pypi.org/project/virustotal-api/
diff --git a/security/py-vulndb/pkg-descr b/security/py-vulndb/pkg-descr
index 40bf1f564bc7..96b492116fdb 100644
--- a/security/py-vulndb/pkg-descr
+++ b/security/py-vulndb/pkg-descr
@@ -1,4 +1,4 @@
Python SDK to access the vulnerability database:
https://github.com/vulndb/data
-WWW: https://pypi.python.org/pypi/vulndb
+WWW: https://pypi.org/project/vulndb/
diff --git a/security/py-zope.app.authentication/pkg-descr b/security/py-zope.app.authentication/pkg-descr
index 78713daeb296..4f676956cdc4 100644
--- a/security/py-zope.app.authentication/pkg-descr
+++ b/security/py-zope.app.authentication/pkg-descr
@@ -1,3 +1,3 @@
Principals and groups management for the pluggable authentication utility.
-WWW: https://pypi.python.org/pypi/zope.app.authentication
+WWW: https://pypi.org/project/zope.app.authentication/
diff --git a/security/py-zope.app.localpermission/pkg-descr b/security/py-zope.app.localpermission/pkg-descr
index db0a29ed8c22..eaec34acfba4 100644
--- a/security/py-zope.app.localpermission/pkg-descr
+++ b/security/py-zope.app.localpermission/pkg-descr
@@ -1,3 +1,3 @@
Local Persistent Permissions for zope.security.
-WWW: https://pypi.python.org/pypi/zope.app.localpermission
+WWW: https://pypi.org/project/zope.app.localpermission/
diff --git a/security/py-zope.app.principalannotation/pkg-descr b/security/py-zope.app.principalannotation/pkg-descr
index d6d9b1e721e2..032aa65f0881 100644
--- a/security/py-zope.app.principalannotation/pkg-descr
+++ b/security/py-zope.app.principalannotation/pkg-descr
@@ -1,3 +1,3 @@
Bootstrap subscriber and browser menu item for zope.principalannotation.
-WWW: https://pypi.python.org/pypi/zope.app.principalannotation
+WWW: https://pypi.org/project/zope.app.principalannotation/
diff --git a/security/py-zope.app.security/pkg-descr b/security/py-zope.app.security/pkg-descr
index 23a719890374..f4b7c937727b 100644
--- a/security/py-zope.app.security/pkg-descr
+++ b/security/py-zope.app.security/pkg-descr
@@ -1,3 +1,3 @@
ZMI Views For Zope3 Security Components.
-WWW: https://pypi.python.org/pypi/zope.app.security
+WWW: https://pypi.org/project/zope.app.security/
diff --git a/security/py-zope.app.securitypolicy/pkg-descr b/security/py-zope.app.securitypolicy/pkg-descr
index cd47b8eb5a38..750458326a72 100644
--- a/security/py-zope.app.securitypolicy/pkg-descr
+++ b/security/py-zope.app.securitypolicy/pkg-descr
@@ -1,3 +1,3 @@
ZMI-based management views for zope.securitypolicy.
-WWW: https://pypi.python.org/pypi/zope.app.securitypolicy
+WWW: https://pypi.org/project/zope.app.securitypolicy/
diff --git a/security/py-zope.authentication/pkg-descr b/security/py-zope.authentication/pkg-descr
index 76a5c9e6fe73..2897ce5cc5f7 100644
--- a/security/py-zope.authentication/pkg-descr
+++ b/security/py-zope.authentication/pkg-descr
@@ -1,3 +1,3 @@
Definition of authentication basics for the Zope Framework.
-WWW: https://pypi.python.org/pypi/zope.authentication
+WWW: https://pypi.org/project/zope.authentication/
diff --git a/security/py-zope.login/pkg-descr b/security/py-zope.login/pkg-descr
index c69db0f347e0..10597a7d5c94 100644
--- a/security/py-zope.login/pkg-descr
+++ b/security/py-zope.login/pkg-descr
@@ -1,3 +1,3 @@
Login helpers for zope.publisher / authentication.
-WWW: https://pypi.python.org/pypi/zope.login
+WWW: https://pypi.org/project/zope.login/
diff --git a/security/py-zope.password/pkg-descr b/security/py-zope.password/pkg-descr
index c8234441e047..9695d811400f 100644
--- a/security/py-zope.password/pkg-descr
+++ b/security/py-zope.password/pkg-descr
@@ -1,4 +1,4 @@
This package provides a password manager mechanism. Password manager is
an utility object that can encode and check encoded passwords.
-WWW: https://pypi.python.org/pypi/zope.password
+WWW: https://pypi.org/project/zope.password/
diff --git a/security/py-zope.pluggableauth/pkg-descr b/security/py-zope.pluggableauth/pkg-descr
index 18b65f05d6ad..8e18e41a9e82 100644
--- a/security/py-zope.pluggableauth/pkg-descr
+++ b/security/py-zope.pluggableauth/pkg-descr
@@ -1,3 +1,3 @@
Pluggable Authentication Utility.
-WWW: https://pypi.python.org/pypi/zope.pluggableauth
+WWW: https://pypi.org/project/zope.pluggableauth/
diff --git a/security/py-zope.principalannotation/pkg-descr b/security/py-zope.principalannotation/pkg-descr
index 8b27e2dc7c6d..ad75768b6585 100644
--- a/security/py-zope.principalannotation/pkg-descr
+++ b/security/py-zope.principalannotation/pkg-descr
@@ -1,3 +1,3 @@
Annotations for Zope Principals.
-WWW: https://pypi.python.org/pypi/zope.principalannotation
+WWW: https://pypi.org/project/zope.principalannotation/
diff --git a/security/py-zope.principalregistry/pkg-descr b/security/py-zope.principalregistry/pkg-descr
index 63b7ba04e5df..4615e6e4e957 100644
--- a/security/py-zope.principalregistry/pkg-descr
+++ b/security/py-zope.principalregistry/pkg-descr
@@ -1,3 +1,3 @@
Global principal registry component for Zope3.
-WWW: https://pypi.python.org/pypi/zope.principalregistry
+WWW: https://pypi.org/project/zope.principalregistry/
diff --git a/security/py-zope.security/pkg-descr b/security/py-zope.security/pkg-descr
index 5ea7248d1814..323627e1c07f 100644
--- a/security/py-zope.security/pkg-descr
+++ b/security/py-zope.security/pkg-descr
@@ -1,4 +1,4 @@
The Security framework provides a generic mechanism to implement security
policies on Python objects.
-WWW: https://pypi.python.org/pypi/zope.security
+WWW: https://pypi.org/project/zope.security/
diff --git a/security/py-zope.securitypolicy/pkg-descr b/security/py-zope.securitypolicy/pkg-descr
index 8e9f4a047c88..ff2a64bf9851 100644
--- a/security/py-zope.securitypolicy/pkg-descr
+++ b/security/py-zope.securitypolicy/pkg-descr
@@ -1,3 +1,3 @@
Default security policy for Zope3.
-WWW: https://pypi.python.org/pypi/zope.securitypolicy
+WWW: https://pypi.org/project/zope.securitypolicy/
diff --git a/security/py-zope.session/pkg-descr b/security/py-zope.session/pkg-descr
index 6f074b538d4e..ff9aaf2d9b8c 100644
--- a/security/py-zope.session/pkg-descr
+++ b/security/py-zope.session/pkg-descr
@@ -1,3 +1,3 @@
Client identification and sessions for Zope.
-WWW: https://pypi.python.org/pypi/zope.session
+WWW: https://pypi.org/project/zope.session/
diff --git a/security/py-zxcvbn/pkg-descr b/security/py-zxcvbn/pkg-descr
index 6841518bb485..57877d06e661 100644
--- a/security/py-zxcvbn/pkg-descr
+++ b/security/py-zxcvbn/pkg-descr
@@ -6,4 +6,4 @@ US television and movies, and other common patterns like dates,
repeats (aaa), sequences (abcd), keyboard patterns (qwertyuiop), and
l33t speak.
-WWW: https://pypi.python.org/pypi/zxcvbn
+WWW: https://pypi.org/project/zxcvbn/
diff --git a/sysutils/py-croniter/pkg-descr b/sysutils/py-croniter/pkg-descr
index 6785ced2c4cb..4e139d7e7a35 100644
--- a/sysutils/py-croniter/pkg-descr
+++ b/sysutils/py-croniter/pkg-descr
@@ -1,3 +1,3 @@
Croniter provides iteration for datetime object with cron like format.
-WWW: https://pypi.python.org/pypi/croniter
+WWW: https://pypi.org/project/croniter/
diff --git a/sysutils/py-crontab/pkg-descr b/sysutils/py-crontab/pkg-descr
index 9fa5e57ff2a6..3c60292fb05e 100644
--- a/sysutils/py-crontab/pkg-descr
+++ b/sysutils/py-crontab/pkg-descr
@@ -1,4 +1,4 @@
Module for reading and writing crontab files and accessing the system cron
automatically and simply using a direct API.
-WWW: https://pypi.python.org/pypi/crontab
+WWW: https://pypi.org/project/crontab/
diff --git a/sysutils/py-pkginfo/pkg-descr b/sysutils/py-pkginfo/pkg-descr
index 1ef329f4511c..e1f483b26073 100644
--- a/sysutils/py-pkginfo/pkg-descr
+++ b/sysutils/py-pkginfo/pkg-descr
@@ -4,4 +4,4 @@ distribution (e.g., created by running bdist_egg). It can also query the
EGG-INFO directory of an installed distribution, and the *.egg-info stored in
a "development checkout" (e.g, created by running setup.py develop).
-WWW: https://pypi.python.org/pypi/pkginfo
+WWW: https://pypi.org/project/pkginfo/
diff --git a/sysutils/py-psutil/pkg-descr b/sysutils/py-psutil/pkg-descr
index b702b16d09c7..6924c83cbaf5 100644
--- a/sysutils/py-psutil/pkg-descr
+++ b/sysutils/py-psutil/pkg-descr
@@ -3,5 +3,5 @@ processes and system utilization (CPU, memory) in a portable way by using
Python, implementing many functionalities offered by tools like ps, top and
Windows task manager.
-WWW: https://pypi.python.org/pypi/psutil
+WWW: https://pypi.org/project/psutil/
WWW: https://github.com/giampaolo/psutil
diff --git a/sysutils/py-psutil121/pkg-descr b/sysutils/py-psutil121/pkg-descr
index c41a902ac578..b03be378410e 100644
--- a/sysutils/py-psutil121/pkg-descr
+++ b/sysutils/py-psutil121/pkg-descr
@@ -3,4 +3,4 @@ on running processes and system utilization (CPU, memory) in a portable
way by using Python, implementing many functionalities offered by tools
like ps, top and Windows task manager.
-WWW: https://pypi.python.org/pypi/psutil
+WWW: https://pypi.org/project/psutil/
diff --git a/sysutils/py-pywatchman/pkg-descr b/sysutils/py-pywatchman/pkg-descr
index 6f9a6175164c..0bd017bd34a6 100644
--- a/sysutils/py-pywatchman/pkg-descr
+++ b/sysutils/py-pywatchman/pkg-descr
@@ -1,3 +1,3 @@
Connect and query Watchman to discover file changes.
-WWW: https://pypi.python.org/pypi/pywatchman
+WWW: https://pypi.org/project/pywatchman/
diff --git a/sysutils/py-salt/pkg-descr b/sysutils/py-salt/pkg-descr
index 011007f16857..c49e8412d351 100644
--- a/sysutils/py-salt/pkg-descr
+++ b/sysutils/py-salt/pkg-descr
@@ -4,5 +4,5 @@ Salt : Remote Execution and State Manager
Salt is a powerful remote execution and state manager that can be
used to administer servers in a fast and efficient way.
-WWW: https://pypi.python.org/pypi/salt
+WWW: https://pypi.org/project/salt/
WWW: http://saltstack.org/
diff --git a/sysutils/py-scriptine/pkg-descr b/sysutils/py-scriptine/pkg-descr
index f5bb965a506c..b6adb9eb7597 100644
--- a/sysutils/py-scriptine/pkg-descr
+++ b/sysutils/py-scriptine/pkg-descr
@@ -11,4 +11,4 @@ Features:
* Easy execution of other shell scripts.
* Convenient working with files and directories.
-WWW: https://pypi.python.org/pypi/scriptine
+WWW: https://pypi.org/project/scriptine/
diff --git a/sysutils/py-tmuxp/pkg-descr b/sysutils/py-tmuxp/pkg-descr
index 4e58b4165cb2..9ab87e9c4dc8 100644
--- a/sysutils/py-tmuxp/pkg-descr
+++ b/sysutils/py-tmuxp/pkg-descr
@@ -1,5 +1,5 @@
tmuxp is a tmux session manager built on libtmux. It supports to load and save
tmux sessions via json and YAML, tmuxinator and teamocil style.
-WWW: https://pypi.python.org/pypi/tmuxp
+WWW: https://pypi.org/project/tmuxp/
WWW: https://github.com/tmux-python/tmuxp
diff --git a/sysutils/py-zdaemon/pkg-descr b/sysutils/py-zdaemon/pkg-descr
index 7f6228ee4e17..68773ae47901 100644
--- a/sysutils/py-zdaemon/pkg-descr
+++ b/sysutils/py-zdaemon/pkg-descr
@@ -5,4 +5,4 @@ for Zope / ZEO, although it is not limited to running Python-based
applications (for instance, it has been used to manage the
'spread' daemon).
-WWW: https://pypi.python.org/pypi/zdaemon
+WWW: https://pypi.org/project/zdaemon/
diff --git a/textproc/py-CommonMark/pkg-descr b/textproc/py-CommonMark/pkg-descr
index 774918fe925b..636bb166ae37 100644
--- a/textproc/py-CommonMark/pkg-descr
+++ b/textproc/py-CommonMark/pkg-descr
@@ -1,4 +1,4 @@
CommonMark-py is a pure Python port of jgm's commonmark.js, a Markdown parser
and renderer for the CommonMark specification, using only native modules.
-WWW: https://pypi.python.org/pypi/CommonMark
+WWW: https://pypi.org/project/CommonMark/
diff --git a/textproc/py-MarkupSafe/pkg-descr b/textproc/py-MarkupSafe/pkg-descr
index 081fdc5840ee..7099545d95e7 100644
--- a/textproc/py-MarkupSafe/pkg-descr
+++ b/textproc/py-MarkupSafe/pkg-descr
@@ -1,4 +1,4 @@
py-MarkupSafe is a python module that implements a XML/HTML/XHTML Markup
safe string.
-WWW: https://pypi.python.org/pypi/MarkupSafe
+WWW: https://pypi.org/project/MarkupSafe/
diff --git a/textproc/py-awesome-slugify/pkg-descr b/textproc/py-awesome-slugify/pkg-descr
index 6ac6bf34fa45..1d70bb79c033 100644
--- a/textproc/py-awesome-slugify/pkg-descr
+++ b/textproc/py-awesome-slugify/pkg-descr
@@ -1,3 +1,3 @@
Python flexible slugify function
-WWW: https://pypi.python.org/pypi/awesome-slugify
+WWW: https://pypi.org/project/awesome-slugify/
diff --git a/textproc/py-cjkwrap/pkg-descr b/textproc/py-cjkwrap/pkg-descr
index d1c752ad650c..0f55a5cc1b11 100644
--- a/textproc/py-cjkwrap/pkg-descr
+++ b/textproc/py-cjkwrap/pkg-descr
@@ -1,4 +1,4 @@
CJKwrap is a library for wrapping and filling CJK (Chinese, Japanese, and
Korean) text. Fix Python issue24665.
-WWW: https://pypi.python.org/pypi/CJKwrap
+WWW: https://pypi.org/project/CJKwrap/
diff --git a/textproc/py-cloud_sptheme/pkg-descr b/textproc/py-cloud_sptheme/pkg-descr
index 21c087939926..1dade0377711 100644
--- a/textproc/py-cloud_sptheme/pkg-descr
+++ b/textproc/py-cloud_sptheme/pkg-descr
@@ -2,4 +2,4 @@ This is a small package containing a Sphinx theme named "Cloud", along with some
related Sphinx extensions. For more details (and to see the theme in action),
check out it's documentation at https://cloud-sptheme.readthedocs.io.
-WWW: https://pypi.python.org/pypi/cloud_sptheme
+WWW: https://pypi.org/project/cloud_sptheme/
diff --git a/textproc/py-colorclass/pkg-descr b/textproc/py-colorclass/pkg-descr
index 4e7c3514c6b1..8e648c9ba03e 100644
--- a/textproc/py-colorclass/pkg-descr
+++ b/textproc/py-colorclass/pkg-descr
@@ -1,4 +1,4 @@
Yet another ANSI color text library for Python. Provides "auto colors" for
dark/light terminals. Works on Linux, OS X, and Windows.
-WWW: https://pypi.python.org/pypi/colorclass
+WWW: https://pypi.org/project/colorclass/
diff --git a/textproc/py-creole/pkg-descr b/textproc/py-creole/pkg-descr
index dcfc323aaac4..d17e15fed876 100644
--- a/textproc/py-creole/pkg-descr
+++ b/textproc/py-creole/pkg-descr
@@ -6,4 +6,4 @@ python-creole is an markup converter in pure Python:
* html -> reStructuredText markup
* html -> textile markup
-WWW: https://pypi.python.org/pypi/python-creole
+WWW: https://pypi.org/project/python-creole/
diff --git a/textproc/py-elasticsearch-async/pkg-descr b/textproc/py-elasticsearch-async/pkg-descr
index 1791e4c4dd9a..6a89c5ecf42e 100644
--- a/textproc/py-elasticsearch-async/pkg-descr
+++ b/textproc/py-elasticsearch-async/pkg-descr
@@ -2,5 +2,5 @@ This is an adapter for elasticsearch providing a transport layer based on
Python's asyncio module. All API calls now return a future wrapping the
response.
-WWW: https://pypi.python.org/pypi/elasticsearch-async
+WWW: https://pypi.org/project/elasticsearch-async/
WWW: https://github.com/elastic/elasticsearch-py-async
diff --git a/textproc/py-enchant/pkg-descr b/textproc/py-enchant/pkg-descr
index b5354688fca0..f39af8c6c039 100644
--- a/textproc/py-enchant/pkg-descr
+++ b/textproc/py-enchant/pkg-descr
@@ -5,4 +5,4 @@ of Enchant with the flexibility of Python and a nice 'Pythonic'
object-oriented interface. It also aims to provide some higher-level
functionality than is available in the C API.
-WWW: https://pypi.python.org/pypi/pyenchant
+WWW: https://pypi.org/project/pyenchant/
diff --git a/textproc/py-errorhandler/pkg-descr b/textproc/py-errorhandler/pkg-descr
index 5bc6d8db7e1e..2c75de76b99d 100644
--- a/textproc/py-errorhandler/pkg-descr
+++ b/textproc/py-errorhandler/pkg-descr
@@ -8,4 +8,4 @@ level.
This can be useful when wanting to ensure that no errors have been
logged before committing data back to a database.
-WWW: https://pypi.python.org/pypi/errorhandler
+WWW: https://pypi.org/project/errorhandler/
diff --git a/textproc/py-esmre/pkg-descr b/textproc/py-esmre/pkg-descr
index b35adac310b0..e95312fe91da 100644
--- a/textproc/py-esmre/pkg-descr
+++ b/textproc/py-esmre/pkg-descr
@@ -1,4 +1,4 @@
Modules used to accelerate execution of a large collection
of regular expressions using the Aho-Corasick algorithms.
-WWW: https://pypi.python.org/pypi/esmre
+WWW: https://pypi.org/project/esmre/
diff --git a/textproc/py-gambit-elasticsearch/pkg-descr b/textproc/py-gambit-elasticsearch/pkg-descr
index a1fc651aa148..d1538805720f 100644
--- a/textproc/py-gambit-elasticsearch/pkg-descr
+++ b/textproc/py-gambit-elasticsearch/pkg-descr
@@ -1,4 +1,4 @@
A python library for performing multi queries in elasticsearch,
a distributed RESTful search engine.
-WWW: https://pypi.python.org/pypi/gambit
+WWW: https://pypi.org/project/gambit/
diff --git a/textproc/py-guess-language/pkg-descr b/textproc/py-guess-language/pkg-descr
index e88d6e417427..4ce1da59dcc1 100644
--- a/textproc/py-guess-language/pkg-descr
+++ b/textproc/py-guess-language/pkg-descr
@@ -4,4 +4,4 @@ which itself is based on Language::Guess by Maciej Ceglowski. Detects
over 60 languages, all languages listed in the trigrams directory
plus Japanese, Chinese, Korean and Greek.
-WWW: https://pypi.python.org/pypi/guess-language
+WWW: https://pypi.org/project/guess-language/
diff --git a/textproc/py-hexdump/pkg-descr b/textproc/py-hexdump/pkg-descr
index b65431705146..8fde068fef7a 100644
--- a/textproc/py-hexdump/pkg-descr
+++ b/textproc/py-hexdump/pkg-descr
@@ -1,3 +1,3 @@
Dump binary data to hex format and restore from there.
-WWW: https://pypi.python.org/pypi/hexdump
+WWW: https://pypi.org/project/hexdump/
diff --git a/textproc/py-html2text/pkg-descr b/textproc/py-html2text/pkg-descr
index ec327482bc82..55a0b5d1b0be 100644
--- a/textproc/py-html2text/pkg-descr
+++ b/textproc/py-html2text/pkg-descr
@@ -2,4 +2,4 @@ html2text is a Python script that converts a page of HTML into clean,
easy-to-read plain ASCII text. Better yet, that ASCII also happens to
be valid Markdown (a text-to-HTML format).
-WWW: https://pypi.python.org/pypi/html2text
+WWW: https://pypi.org/project/html2text/
diff --git a/textproc/py-hunspell/pkg-descr b/textproc/py-hunspell/pkg-descr
index 12dc50854099..4753dd7cad3d 100644
--- a/textproc/py-hunspell/pkg-descr
+++ b/textproc/py-hunspell/pkg-descr
@@ -3,4 +3,4 @@ lets developers load Hunspell dictionaries, check words, get suggestions, add
new words, etc. It also provides some basic morphological analysis related
methods.
-WWW: https://pypi.python.org/pypi/hunspell
+WWW: https://pypi.org/project/hunspell/
diff --git a/textproc/py-hypua2jamo/pkg-descr b/textproc/py-hypua2jamo/pkg-descr
index 31a6bb2512a6..657e8425dc05 100644
--- a/textproc/py-hypua2jamo/pkg-descr
+++ b/textproc/py-hypua2jamo/pkg-descr
@@ -1,3 +1,3 @@
Convert Hanyang-PUA code to unicode Hangul Jamo
-WWW: https://pypi.python.org/pypi/hypua2jamo
+WWW: https://pypi.org/project/hypua2jamo/
diff --git a/textproc/py-jaxml/pkg-descr b/textproc/py-jaxml/pkg-descr
index 963e52cc72c2..b03d0fc07fb1 100644
--- a/textproc/py-jaxml/pkg-descr
+++ b/textproc/py-jaxml/pkg-descr
@@ -1,4 +1,4 @@
A Python module to generate XML easily
-WWW: https://pypi.python.org/pypi/jaxml
+WWW: https://pypi.org/project/jaxml/
WWW: http://www.librelogiciel.com/software/jaxml/
diff --git a/textproc/py-pager/pkg-descr b/textproc/py-pager/pkg-descr
index d8d19d09b303..5fe7e0d78401 100644
--- a/textproc/py-pager/pkg-descr
+++ b/textproc/py-pager/pkg-descr
@@ -1,4 +1,4 @@
Python module that pages output to the screen, reads keys and console
dimensions without executing external utils.
-WWW: https://pypi.python.org/pypi/pager
+WWW: https://pypi.org/project/pager/
diff --git a/textproc/py-parsimonious/pkg-descr b/textproc/py-parsimonious/pkg-descr
index fe527479e17e..5129593f10b1 100644
--- a/textproc/py-parsimonious/pkg-descr
+++ b/textproc/py-parsimonious/pkg-descr
@@ -5,4 +5,4 @@ notation. Parsimonious was designed to undergird a MediaWiki parser
that wouldn't take 5 seconds or a GB of RAM to do one page, but it's
applicable to all sorts of languages.
-WWW: https://pypi.python.org/pypi/parsimonious
+WWW: https://pypi.org/project/parsimonious/
diff --git a/textproc/py-pyctpp2/pkg-descr b/textproc/py-pyctpp2/pkg-descr
index 71afe0d0489b..c626baa7f1a5 100644
--- a/textproc/py-pyctpp2/pkg-descr
+++ b/textproc/py-pyctpp2/pkg-descr
@@ -1,3 +1,3 @@
Python interface to CTPP2 library.
-WWW: https://pypi.python.org/pypi/pyctpp2
+WWW: https://pypi.org/project/pyctpp2/
diff --git a/textproc/py-pygtail/pkg-descr b/textproc/py-pygtail/pkg-descr
index 86a4235e02a9..8aae8cf33aac 100644
--- a/textproc/py-pygtail/pkg-descr
+++ b/textproc/py-pygtail/pkg-descr
@@ -3,4 +3,4 @@ A python "port" of logcheck's logtail2.
Pygtail reads log file lines that have not been read. It will even handle
log files that have been rotated.
-WWW: https://pypi.python.org/pypi/pygtail
+WWW: https://pypi.org/project/pygtail/
diff --git a/textproc/py-pyhwp/pkg-descr b/textproc/py-pyhwp/pkg-descr
index 3f86c3a9c32d..6414fe61830a 100644
--- a/textproc/py-pyhwp/pkg-descr
+++ b/textproc/py-pyhwp/pkg-descr
@@ -2,4 +2,4 @@ Analyze and extract internal streams out from a HWP Document Format v5 file
Includes (experimental) Conversion to OpenDocument format (.odt) or plain
text (.txt)
-WWW: https://pypi.python.org/pypi/pyhwp
+WWW: https://pypi.org/project/pyhwp/
diff --git a/textproc/py-pylons-sphinx-themes/pkg-descr b/textproc/py-pylons-sphinx-themes/pkg-descr
index 53de4f03405b..1cede5ae724b 100644
--- a/textproc/py-pylons-sphinx-themes/pkg-descr
+++ b/textproc/py-pylons-sphinx-themes/pkg-descr
@@ -2,5 +2,5 @@ Pylons Sphinx Themes is a Python package that contains Sphinx themes for Pylons
related projects. This project is based on Pylons Sphinx Theme (singular), but
uses a package implementation instead of git submodules and manual steps.
-WWW: https://pypi.python.org/pypi/pylons-sphinx-themes
+WWW: https://pypi.org/project/pylons-sphinx-themes/
WWW: https://github.com/Pylons/pylons_sphinx_theme
diff --git a/textproc/py-pyphen/pkg-descr b/textproc/py-pyphen/pkg-descr
index d81560d2bcd8..a816b4dd584f 100644
--- a/textproc/py-pyphen/pkg-descr
+++ b/textproc/py-pyphen/pkg-descr
@@ -1,4 +1,4 @@
Pyphen is a pure Python module to hyphenate text using existing Hunspell
hyphenation dictionaries.
-WWW: https://pypi.python.org/pypi/Pyphen
+WWW: https://pypi.org/project/Pyphen/
diff --git a/textproc/py-pystemmer/pkg-descr b/textproc/py-pystemmer/pkg-descr
index 702449f239cb..19fca5c203a4 100644
--- a/textproc/py-pystemmer/pkg-descr
+++ b/textproc/py-pystemmer/pkg-descr
@@ -13,4 +13,4 @@ for english: although this has been superceded by an improved algorithm,
the original algorithm may be of interest to information retrieval
researchers wishing to reproduce results of earlier experiments.
-WWW: https://pypi.python.org/pypi/PyStemmer
+WWW: https://pypi.org/project/PyStemmer/
diff --git a/textproc/py-python-gettext/pkg-descr b/textproc/py-python-gettext/pkg-descr
index aed3607dac89..fce809995363 100644
--- a/textproc/py-python-gettext/pkg-descr
+++ b/textproc/py-python-gettext/pkg-descr
@@ -2,4 +2,4 @@ This implementation of Gettext for Python includes a Msgfmt class
which can be used to generate compiled mo files from Gettext po
files and includes support for the newer msgctxt keyword.
-WWW: https://pypi.python.org/pypi/python-gettext
+WWW: https://pypi.org/project/python-gettext/
diff --git a/textproc/py-rdflib/pkg-descr b/textproc/py-rdflib/pkg-descr
index 5134f71d8af0..fcbc5d55f9e5 100644
--- a/textproc/py-rdflib/pkg-descr
+++ b/textproc/py-rdflib/pkg-descr
@@ -3,4 +3,4 @@ parser/serializer.
Git repository: https://github.com/RDFLib/rdflib
-WWW: https://pypi.python.org/pypi/rdflib
+WWW: https://pypi.org/project/rdflib/
diff --git a/textproc/py-regex/pkg-descr b/textproc/py-regex/pkg-descr
index bca8efaf2066..ea4d00ee6e85 100644
--- a/textproc/py-regex/pkg-descr
+++ b/textproc/py-regex/pkg-descr
@@ -1,4 +1,4 @@
This new regex implementation is intended eventually to replace Python's
current re module implementation.
-WWW: https://pypi.python.org/pypi/regex
+WWW: https://pypi.org/project/regex/
diff --git a/textproc/py-snowballstemmer/pkg-descr b/textproc/py-snowballstemmer/pkg-descr
index b655bea35195..ca7660120f97 100644
--- a/textproc/py-snowballstemmer/pkg-descr
+++ b/textproc/py-snowballstemmer/pkg-descr
@@ -1,4 +1,4 @@
This is a pure Python stemming library. If PyStemmer is
available, this module uses it to accelerate.
-WWW: https://pypi.python.org/pypi/snowballstemmer
+WWW: https://pypi.org/project/snowballstemmer/
diff --git a/textproc/py-sparqlwrapper/pkg-descr b/textproc/py-sparqlwrapper/pkg-descr
index 499fc8154912..b1df4574aeac 100644
--- a/textproc/py-sparqlwrapper/pkg-descr
+++ b/textproc/py-sparqlwrapper/pkg-descr
@@ -1,5 +1,5 @@
This is a wrapper around a SPARQL service. It helps in creating the query URI
and, possibly, convert the result into a more manageable format.
-WWW: https://pypi.python.org/pypi/SPARQLWrapper
+WWW: https://pypi.org/project/SPARQLWrapper/
WWW: http://rdflib.github.io/sparqlwrapper/
diff --git a/textproc/py-sphinx-intl/pkg-descr b/textproc/py-sphinx-intl/pkg-descr
index 85d104cbf83d..ce3af790f4e5 100644
--- a/textproc/py-sphinx-intl/pkg-descr
+++ b/textproc/py-sphinx-intl/pkg-descr
@@ -2,4 +2,4 @@ Sphinx-intl is a utility tool that provides several features that
makes it easy to translate and to apply translation to Sphinx
generated document.
-WWW: https://pypi.python.org/pypi/sphinx-intl
+WWW: https://pypi.org/project/sphinx-intl/
diff --git a/textproc/py-sphinxcontrib-adadomain/pkg-descr b/textproc/py-sphinxcontrib-adadomain/pkg-descr
index 4b1999735555..64284894c51d 100644
--- a/textproc/py-sphinxcontrib-adadomain/pkg-descr
+++ b/textproc/py-sphinxcontrib-adadomain/pkg-descr
@@ -1,4 +1,4 @@
This module contains the AdaDomain Sphinx extension which was created by
Tero Koskinen.
-WWW: https://pypi.python.org/pypi/sphinxcontrib-adadomain
+WWW: https://pypi.org/project/sphinxcontrib-adadomain/
diff --git a/textproc/py-sphinxcontrib-fulltoc/pkg-descr b/textproc/py-sphinxcontrib-fulltoc/pkg-descr
index 186adf86e53b..d2abfcebc817 100644
--- a/textproc/py-sphinxcontrib-fulltoc/pkg-descr
+++ b/textproc/py-sphinxcontrib-fulltoc/pkg-descr
@@ -1,4 +1,4 @@
This module contains the Fulltoc Sphinx extension which was created by
Doug Hellmann.
-WWW: https://pypi.python.org/pypi/sphinxcontrib-fulltoc
+WWW: https://pypi.org/project/sphinxcontrib-fulltoc/
diff --git a/textproc/py-stemming/pkg-descr b/textproc/py-stemming/pkg-descr
index ede400cdcf88..bcb6bf1a9ff4 100644
--- a/textproc/py-stemming/pkg-descr
+++ b/textproc/py-stemming/pkg-descr
@@ -16,4 +16,4 @@ is useful in various natural language processing scenarios, such as search.
In general ``porter2`` is the best overall stemming algorithm, but not
necessarily the fastest or most aggressive.
-WWW: https://pypi.python.org/pypi/stemming
+WWW: https://pypi.org/project/stemming/
diff --git a/textproc/py-tabletext/pkg-descr b/textproc/py-tabletext/pkg-descr
index d6b09461b61b..84ae9fad6f10 100644
--- a/textproc/py-tabletext/pkg-descr
+++ b/textproc/py-tabletext/pkg-descr
@@ -2,4 +2,4 @@ tabletext is a Python library to format (pretty-print) tabular data as
text tables. Its goal is to be as simple as possible, while allowing
optional customization of the output.
-WWW: https://pypi.python.org/pypi/tabletext
+WWW: https://pypi.org/project/tabletext/
diff --git a/textproc/py-terminaltables/pkg-descr b/textproc/py-terminaltables/pkg-descr
index dbaff6e7ff6d..b55fe92a079b 100644
--- a/textproc/py-terminaltables/pkg-descr
+++ b/textproc/py-terminaltables/pkg-descr
@@ -1,4 +1,4 @@
Easily draw tables in terminal/console applications from a list of
lists of strings. Supports multi-line rows.
-WWW: https://pypi.python.org/pypi/terminaltables
+WWW: https://pypi.org/project/terminaltables/
diff --git a/textproc/py-texttable/pkg-descr b/textproc/py-texttable/pkg-descr
index 110270b63639..64535d6483c1 100644
--- a/textproc/py-texttable/pkg-descr
+++ b/textproc/py-texttable/pkg-descr
@@ -1,4 +1,4 @@
texttable is a module to generate a formatted text table, using ASCII
characters.
-WWW: https://pypi.python.org/pypi/texttable
+WWW: https://pypi.org/project/texttable/
diff --git a/textproc/py-tinycss/pkg-descr b/textproc/py-tinycss/pkg-descr
index f30cbac143f8..e6bfaa55424c 100644
--- a/textproc/py-tinycss/pkg-descr
+++ b/textproc/py-tinycss/pkg-descr
@@ -8,4 +8,4 @@ full syntax and error handling for CSS 2.1 as well as some CSS 3 modules:
It is designed to be easy to extend for new CSS modules and syntax, and
integrates well with cssselect for Selectors 3 support.
-WWW: https://pypi.python.org/pypi/tinycss
+WWW: https://pypi.org/project/tinycss/
diff --git a/textproc/py-toronado/pkg-descr b/textproc/py-toronado/pkg-descr
index 01de620938e4..4ec82c342697 100644
--- a/textproc/py-toronado/pkg-descr
+++ b/textproc/py-toronado/pkg-descr
@@ -1,3 +1,3 @@
Fast lxml-based CSS stylesheet inliner.
-WWW: https://pypi.python.org/pypi/toronado
+WWW: https://pypi.org/project/toronado/
diff --git a/textproc/py-trans/pkg-descr b/textproc/py-trans/pkg-descr
index a85ec0cf9386..305ccb97dad9 100644
--- a/textproc/py-trans/pkg-descr
+++ b/textproc/py-trans/pkg-descr
@@ -2,4 +2,4 @@ This module translates national characters into similar sounding latin
characters (transliteration). At the moment, Czech, Greek, Latvian, Polish,
Turkish, Russian, Ukrainian alphabets are supported (it covers 99% of needs).
-WWW: https://pypi.python.org/pypi/trans
+WWW: https://pypi.org/project/trans/
diff --git a/textproc/py-translationstring/pkg-descr b/textproc/py-translationstring/pkg-descr
index 63916fda6d4d..2ae6d7596683 100644
--- a/textproc/py-translationstring/pkg-descr
+++ b/textproc/py-translationstring/pkg-descr
@@ -7,4 +7,4 @@ It does not depend on Babel, but its translation and pluralization
services are meant to work best when provided with an instance of
the babel.support.Translations class.
-WWW: https://pypi.python.org/pypi/translationstring
+WWW: https://pypi.org/project/translationstring/
diff --git a/textproc/py-whoosh/pkg-descr b/textproc/py-whoosh/pkg-descr
index 314144b305f5..6cd53785f5e4 100644
--- a/textproc/py-whoosh/pkg-descr
+++ b/textproc/py-whoosh/pkg-descr
@@ -16,5 +16,5 @@ Some of Whoosh's features include:
- Powerful query language.
- Pure Python spell-checker (as far as I know, the only one).
-WWW: https://pypi.python.org/pypi/Whoosh
+WWW: https://pypi.org/project/Whoosh/
WWW: http://bitbucket.org/mchaput/whoosh
diff --git a/textproc/py-wicked/pkg-descr b/textproc/py-wicked/pkg-descr
index 9c1eec237c0b..e25229053d13 100644
--- a/textproc/py-wicked/pkg-descr
+++ b/textproc/py-wicked/pkg-descr
@@ -1,4 +1,4 @@
wicked is a compact syntax for doing wiki-like content linking and creation
in zope and plone.
-WWW: https://pypi.python.org/pypi/wicked
+WWW: https://pypi.org/project/wicked/
diff --git a/textproc/py-zope.app.i18n/pkg-descr b/textproc/py-zope.app.i18n/pkg-descr
index 50141c8a4dda..f509a3692a3b 100644
--- a/textproc/py-zope.app.i18n/pkg-descr
+++ b/textproc/py-zope.app.i18n/pkg-descr
@@ -1,3 +1,3 @@
Persistent translation domains and message catalogs.
-WWW: https://pypi.python.org/pypi/zope.app.i18n
+WWW: https://pypi.org/project/zope.app.i18n/
diff --git a/textproc/py-zope.app.locales/pkg-descr b/textproc/py-zope.app.locales/pkg-descr
index aa773a43e13e..a1a3979e2ae2 100644
--- a/textproc/py-zope.app.locales/pkg-descr
+++ b/textproc/py-zope.app.locales/pkg-descr
@@ -1,3 +1,3 @@
Zope locale extraction and management utilities.
-WWW: https://pypi.python.org/pypi/zope.app.locales
+WWW: https://pypi.org/project/zope.app.locales/
diff --git a/textproc/py-zope.i18nmessageid/pkg-descr b/textproc/py-zope.i18nmessageid/pkg-descr
index cfb588b50d38..2994f3cdad8b 100644
--- a/textproc/py-zope.i18nmessageid/pkg-descr
+++ b/textproc/py-zope.i18nmessageid/pkg-descr
@@ -2,4 +2,4 @@ zope.i18nmessageid provides facilities for declaring such messages
within program source text; translation of the messages is the
responsiblitiy of the 'zope.i18n' package.
-WWW: https://pypi.python.org/pypi/zope.i18nmessageid
+WWW: https://pypi.org/project/zope.i18nmessageid/
diff --git a/textproc/py-zope.structuredtext/pkg-descr b/textproc/py-zope.structuredtext/pkg-descr
index a1170e2cfd0b..8aafa69f8ee9 100644
--- a/textproc/py-zope.structuredtext/pkg-descr
+++ b/textproc/py-zope.structuredtext/pkg-descr
@@ -2,4 +2,4 @@ This package provides a parser and renderers for the classic Zope
"structured text" markup dialect (STX). STX is a plain text markup
in which document structure is signalled primarily by identation.
-WWW: https://pypi.python.org/pypi/zope.structuredtext
+WWW: https://pypi.org/project/zope.structuredtext/
diff --git a/textproc/py-zope.tal/pkg-descr b/textproc/py-zope.tal/pkg-descr
index af30d77b325d..6e655d6c2388 100644
--- a/textproc/py-zope.tal/pkg-descr
+++ b/textproc/py-zope.tal/pkg-descr
@@ -4,4 +4,4 @@ renderer to inject dynamic markup into a page. It also includes
the Macro Expansion for TAL (METAL) macro language used in page
assembly.
-WWW: https://pypi.python.org/pypi/zope.tal
+WWW: https://pypi.org/project/zope.tal/
diff --git a/www/butterfly/pkg-descr b/www/butterfly/pkg-descr
index a8b36d491650..24ef790f8745 100644
--- a/www/butterfly/pkg-descr
+++ b/www/butterfly/pkg-descr
@@ -14,4 +14,4 @@ Features
* Geolocation from browser
* May work on firefox too
-WWW: https://pypi.python.org/pypi/butterfly
+WWW: https://pypi.org/project/butterfly/
diff --git a/www/py-Products.PloneLDAP/pkg-descr b/www/py-Products.PloneLDAP/pkg-descr
index 88bdc032113c..c8f6bdb2d549 100644
--- a/www/py-Products.PloneLDAP/pkg-descr
+++ b/www/py-Products.PloneLDAP/pkg-descr
@@ -1,3 +1,3 @@
LDAP/Active Directory support for Plone
-WWW: https://pypi.python.org/pypi/Products.PloneLDAP
+WWW: https://pypi.org/project/Products.PloneLDAP/
diff --git a/www/py-WebError/pkg-descr b/www/py-WebError/pkg-descr
index 20a529915b1c..b7cef23b81e4 100644
--- a/www/py-WebError/pkg-descr
+++ b/www/py-WebError/pkg-descr
@@ -1,4 +1,4 @@
py-WebError is a python module for web error handling and
exception catching.
-WWW: https://pypi.python.org/pypi/WebError
+WWW: https://pypi.org/project/WebError/
diff --git a/www/py-azure-common/pkg-descr b/www/py-azure-common/pkg-descr
index 826eda033c5a..1b3811fa85ec 100644
--- a/www/py-azure-common/pkg-descr
+++ b/www/py-azure-common/pkg-descr
@@ -1,4 +1,4 @@
Microsoft Azure Storage SDK for Python provides shared code by the Azure
packages.
-WWW: https://pypi.python.org/pypi/azure-common
+WWW: https://pypi.org/project/azure-common/
diff --git a/www/py-azure-storage/pkg-descr b/www/py-azure-storage/pkg-descr
index 69a14ec3cb9a..a99df17481c9 100644
--- a/www/py-azure-storage/pkg-descr
+++ b/www/py-azure-storage/pkg-descr
@@ -1,4 +1,4 @@
Microsoft Azure Storage SDK for Python provides a client library in Python
that makes it easy to consume Microsoft Azure Storage services.
-WWW: https://pypi.python.org/pypi/azure-storage
+WWW: https://pypi.org/project/azure-storage/
diff --git a/www/py-collective.easytemplate/pkg-descr b/www/py-collective.easytemplate/pkg-descr
index f21e5da9f06a..6eab545ca736 100644
--- a/www/py-collective.easytemplate/pkg-descr
+++ b/www/py-collective.easytemplate/pkg-descr
@@ -1,3 +1,3 @@
collective.easytemplate addon for Plone.
-WWW: https://pypi.python.org/pypi/collective.easytemplate
+WWW: https://pypi.org/project/collective.easytemplate/
diff --git a/www/py-collective.templateengines/pkg-descr b/www/py-collective.templateengines/pkg-descr
index 29f6f36d3add..e20ab770b240 100644
--- a/www/py-collective.templateengines/pkg-descr
+++ b/www/py-collective.templateengines/pkg-descr
@@ -2,4 +2,4 @@ collective.templateengines is an template engine abstraction layer for Python.
It defines generic Zope interfaces for communicating with various Python
template engines to achieve higher code reuse value.
-WWW: https://pypi.python.org/pypi/collective.templateengines
+WWW: https://pypi.org/project/collective.templateengines/
diff --git a/www/py-cssmin/pkg-descr b/www/py-cssmin/pkg-descr
index 1221e01f6512..b7ff5450cbaa 100644
--- a/www/py-cssmin/pkg-descr
+++ b/www/py-cssmin/pkg-descr
@@ -1,4 +1,4 @@
This is a Python port of the YUI CSS Compressor.
-WWW: https://pypi.python.org/pypi/cssmin
+WWW: https://pypi.org/project/cssmin/
WWW: https://github.com/zacharyvoase/cssmin
diff --git a/www/py-cssutils/pkg-descr b/www/py-cssutils/pkg-descr
index c1df2c5bb537..d4a66be27e70 100644
--- a/www/py-cssutils/pkg-descr
+++ b/www/py-cssutils/pkg-descr
@@ -2,5 +2,5 @@ A Python package to parse and build CSS Cascading Style Sheets. Partly implement
the DOM Level 2 CSS interfaces. Additional some cssutils only convenience and
(hopefully) more pythonic methods are integrated.
-WWW: https://pypi.python.org/pypi/cssutils
+WWW: https://pypi.org/project/cssutils/
WWW: http://cthedot.de/cssutils/
diff --git a/www/py-django-babel/pkg-descr b/www/py-django-babel/pkg-descr
index 23a556ab1d6e..cf146e3b0df0 100644
--- a/www/py-django-babel/pkg-descr
+++ b/www/py-django-babel/pkg-descr
@@ -1,3 +1,3 @@
Utilities for using Babel in Django
-WWW: https://pypi.python.org/pypi/django-babel
+WWW: https://pypi.org/project/django-babel/
diff --git a/www/py-django-bootstrap-form/pkg-descr b/www/py-django-bootstrap-form/pkg-descr
index 7ed666afc10d..44928134b063 100644
--- a/www/py-django-bootstrap-form/pkg-descr
+++ b/www/py-django-bootstrap-form/pkg-descr
@@ -3,4 +3,4 @@ Generate twitter-bootstrap form output for django form
A simple Django template tag to work with twitter bootstrap (
http://twitter.github.com/bootstrap/ )
-WWW: https://pypi.python.org/pypi/django-bootstrap-form
+WWW: https://pypi.org/project/django-bootstrap-form/
diff --git a/www/py-django-braces/pkg-descr b/www/py-django-braces/pkg-descr
index c6ac1fc6bb34..904d9f787e97 100644
--- a/www/py-django-braces/pkg-descr
+++ b/www/py-django-braces/pkg-descr
@@ -1,4 +1,4 @@
django-braces provides mixins for Django's class-based views.
-WWW: https://pypi.python.org/pypi/django-braces
+WWW: https://pypi.org/project/django-braces/
WWW: https://github.com/brack3t/django-braces
diff --git a/www/py-django-countries/pkg-descr b/www/py-django-countries/pkg-descr
index 2954ac53157d..66e3396968af 100644
--- a/www/py-django-countries/pkg-descr
+++ b/www/py-django-countries/pkg-descr
@@ -1,4 +1,4 @@
A Django application that provides country choices for use with
forms, flag icons static files, and a country field for models.
-WWW: https://pypi.python.org/pypi/django-countries
+WWW: https://pypi.org/project/django-countries/
diff --git a/www/py-django-crispy-forms/pkg-descr b/www/py-django-crispy-forms/pkg-descr
index f7206448010a..602f23e03e88 100644
--- a/www/py-django-crispy-forms/pkg-descr
+++ b/www/py-django-crispy-forms/pkg-descr
@@ -11,5 +11,5 @@ The application mainly provides:
and specific layout setup. This gives you amazing power without much hassle,
helping you save tons of time.
-WWW: https://pypi.python.org/pypi/django-crispy-forms
+WWW: https://pypi.org/project/django-crispy-forms/
WWW: https://github.com/django-crispy-forms/django-crispy-forms
diff --git a/www/py-django-datetime-widget/pkg-descr b/www/py-django-datetime-widget/pkg-descr
index a98e8c3024e3..461558d1fc5a 100644
--- a/www/py-django-datetime-widget/pkg-descr
+++ b/www/py-django-datetime-widget/pkg-descr
@@ -1,4 +1,4 @@
Django-datetime-widget is a simple and clean widget for DateTimeField.
It's based on bootstrap-datepicker by Stefan Petre.
-WWW: https://pypi.python.org/pypi/django-datetime-widget
+WWW: https://pypi.org/project/django-datetime-widget/
diff --git a/www/py-django-debug-toolbar/pkg-descr b/www/py-django-debug-toolbar/pkg-descr
index b2bc31c751e1..ccf4f00e844e 100644
--- a/www/py-django-debug-toolbar/pkg-descr
+++ b/www/py-django-debug-toolbar/pkg-descr
@@ -2,5 +2,5 @@ The Django Debug Toolbar is a configurable set of panels that display various
debug information about the current request/response and when clicked, display
more details about the panel's content.
-WWW: https://pypi.python.org/pypi/django-debug-toolbar
+WWW: https://pypi.org/project/django-debug-toolbar/
WWW: https://github.com/jazzband/django-debug-toolbar
diff --git a/www/py-django-filer/pkg-descr b/www/py-django-filer/pkg-descr
index 8b8ca19e5207..52ab27f6f6d5 100644
--- a/www/py-django-filer/pkg-descr
+++ b/www/py-django-filer/pkg-descr
@@ -1,5 +1,5 @@
django-filer is a file management application for django. It handles
uploading and organizing files and images in contrib.admin.
-WWW: https://pypi.python.org/pypi/django-filer
+WWW: https://pypi.org/project/django-filer/
WWW: https://github.com/stefanfoulis/django-filer
diff --git a/www/py-django-guardian/pkg-descr b/www/py-django-guardian/pkg-descr
index 4f48c4114fc7..fd6c335644c1 100644
--- a/www/py-django-guardian/pkg-descr
+++ b/www/py-django-guardian/pkg-descr
@@ -1,4 +1,4 @@
django-guardian is an implementation of object permissions for Django
providing extra authentication backend.
-WWW: https://pypi.python.org/pypi/django-guardian
+WWW: https://pypi.org/project/django-guardian/
diff --git a/www/py-django-htmlmin/pkg-descr b/www/py-django-htmlmin/pkg-descr
index 18b64c44c80b..d571e6e88d3d 100644
--- a/www/py-django-htmlmin/pkg-descr
+++ b/www/py-django-htmlmin/pkg-descr
@@ -3,4 +3,4 @@ It supports Django, Flask and many other Python web frameworks. It also
provides a command line tool, that can be used for static websites or
deployment scripts.
-WWW: https://pypi.python.org/pypi/django-htmlmin
+WWW: https://pypi.org/project/django-htmlmin/
diff --git a/www/py-django-markwhat/pkg-descr b/www/py-django-markwhat/pkg-descr
index 381f5a954f52..15aaed20aa4c 100644
--- a/www/py-django-markwhat/pkg-descr
+++ b/www/py-django-markwhat/pkg-descr
@@ -14,4 +14,4 @@ returns a string representing the marked-up text. For example, the
``textile`` filter converts text that is marked-up in Textile format
to HTML.
-WWW: https://pypi.python.org/pypi/django-markwhat
+WWW: https://pypi.org/project/django-markwhat/
diff --git a/www/py-django-model-utils/pkg-descr b/www/py-django-model-utils/pkg-descr
index c24080a2358b..634e12d10f40 100644
--- a/www/py-django-model-utils/pkg-descr
+++ b/www/py-django-model-utils/pkg-descr
@@ -1,5 +1,5 @@
django-model-utils provides Django model mixins and utilities and supports
Django 1.8 to 2.0.
-WWW: https://pypi.python.org/pypi/django-model-utils
+WWW: https://pypi.org/project/django-model-utils/
WWW: https://github.com/jazzband/django-model-utils
diff --git a/www/py-django-otp-yubikey/pkg-descr b/www/py-django-otp-yubikey/pkg-descr
index dc72cfb1ff7d..87dcacaa6be1 100644
--- a/www/py-django-otp-yubikey/pkg-descr
+++ b/www/py-django-otp-yubikey/pkg-descr
@@ -2,4 +2,4 @@ This is a django-otp plugin that handles YubiKey devices using the Yubico OTP
algorithm. This includes two device definitions: one to verify YubiKey tokens
locally and another to verify them against a web service.
-WWW: https://pypi.python.org/pypi/django-otp-yubikey
+WWW: https://pypi.org/project/django-otp-yubikey/
diff --git a/www/py-django-picklefield/pkg-descr b/www/py-django-picklefield/pkg-descr
index cdaa811316ca..4472fae297fa 100644
--- a/www/py-django-picklefield/pkg-descr
+++ b/www/py-django-picklefield/pkg-descr
@@ -5,5 +5,5 @@ It is incredibly useful for storing just about anything in the database
(provided it is Pickle-able, of course) when there isn't a 'proper' field for
the job.
-WWW: https://pypi.python.org/pypi/django-picklefield
+WWW: https://pypi.org/project/django-picklefield/
WWW: https://github.com/gintas/django-picklefield
diff --git a/www/py-django-pyscss/pkg-descr b/www/py-django-pyscss/pkg-descr
index f6509fd04f27..0e27e39c953d 100644
--- a/www/py-django-pyscss/pkg-descr
+++ b/www/py-django-pyscss/pkg-descr
@@ -1,3 +1,3 @@
Makes it easier to use PySCSS in Django.
-WWW: https://pypi.python.org/pypi/django-pyscss
+WWW: https://pypi.org/project/django-pyscss/
diff --git a/www/py-django-reversion/pkg-descr b/www/py-django-reversion/pkg-descr
index ca32fe5a9da8..6bee58724820 100644
--- a/www/py-django-reversion/pkg-descr
+++ b/www/py-django-reversion/pkg-descr
@@ -14,4 +14,4 @@ provides comprehensive version control facilities:
django-reversion can be easily added to your existing Django project
with an absolute minimum of code changes.
-WWW: https://pypi.python.org/pypi/django-reversion
+WWW: https://pypi.org/project/django-reversion/
diff --git a/www/py-django-signals-ahoy/pkg-descr b/www/py-django-signals-ahoy/pkg-descr
index 2ca02932c6f0..98c3ca5daea6 100644
--- a/www/py-django-signals-ahoy/pkg-descr
+++ b/www/py-django-signals-ahoy/pkg-descr
@@ -1,3 +1,3 @@
Provides an extended set of signals for use by Django apps.
-WWW: https://pypi.python.org/pypi/django-signals-ahoy
+WWW: https://pypi.org/project/django-signals-ahoy/
diff --git a/www/py-django-simple-captcha/pkg-descr b/www/py-django-simple-captcha/pkg-descr
index efe265dd8760..50d2bf8c5d71 100644
--- a/www/py-django-simple-captcha/pkg-descr
+++ b/www/py-django-simple-captcha/pkg-descr
@@ -1,4 +1,4 @@
Django Simple Captcha is an extremely simple, yet highly customizable Django
application to add captcha images to any Django form.
-WWW: https://pypi.python.org/pypi/django-simple-captcha
+WWW: https://pypi.org/project/django-simple-captcha/
diff --git a/www/py-django_openstack_auth/pkg-descr b/www/py-django_openstack_auth/pkg-descr
index 0d0b609ed052..af7b9784d518 100644
--- a/www/py-django_openstack_auth/pkg-descr
+++ b/www/py-django_openstack_auth/pkg-descr
@@ -1,3 +1,3 @@
Django authentication backend for use with OpenStack Identity
-WWW: https://pypi.python.org/pypi/django_openstack_auth
+WWW: https://pypi.org/project/django_openstack_auth/
diff --git a/www/py-flask-compress/pkg-descr b/www/py-flask-compress/pkg-descr
index 83a8aeddd676..3d38a6302c8b 100644
--- a/www/py-flask-compress/pkg-descr
+++ b/www/py-flask-compress/pkg-descr
@@ -6,4 +6,4 @@ Internally, every time a request is made the extension will check if
it matches one of the compressible MIME types and will automatically
attach the appropriate headers.
-WWW: https://pypi.python.org/pypi/Flask-Compress
+WWW: https://pypi.org/project/Flask-Compress/
diff --git a/www/py-flask-uploads/pkg-descr b/www/py-flask-uploads/pkg-descr
index 9a1f57835c1e..5346d7df2de4 100644
--- a/www/py-flask-uploads/pkg-descr
+++ b/www/py-flask-uploads/pkg-descr
@@ -1,4 +1,4 @@
Flask-Uploads allows your application to flexibly and efficiently handle file
uploading and serving the uploaded files.
-WWW: https://pypi.python.org/pypi/Flask-Uploads
+WWW: https://pypi.org/project/Flask-Uploads/
diff --git a/www/py-google-api-core/pkg-descr b/www/py-google-api-core/pkg-descr
index 9d4c16fb51e6..f8b585773e23 100644
--- a/www/py-google-api-core/pkg-descr
+++ b/www/py-google-api-core/pkg-descr
@@ -3,5 +3,5 @@ Core Library for Google Client Libraries
This library is not meant to stand-alone. Instead it defines common helpers used
by all Google API clients.
-WWW: https://pypi.python.org/pypi/google-api-core
+WWW: https://pypi.org/project/google-api-core/
WWW: https://github.com/GoogleCloudPlatform/google-cloud-python
diff --git a/www/py-google-cloud-core/pkg-descr b/www/py-google-cloud-core/pkg-descr
index 2c83389dd9f0..17a8a99eb032 100644
--- a/www/py-google-cloud-core/pkg-descr
+++ b/www/py-google-cloud-core/pkg-descr
@@ -1,4 +1,4 @@
This library is not meant to stand-alone. Instead it defines common helpers
(e.g. base Client classes) used by all of the google-cloud-* packages.
-WWW: https://pypi.python.org/pypi/google-cloud-core
+WWW: https://pypi.org/project/google-cloud-core/
diff --git a/www/py-google-cloud-storage/pkg-descr b/www/py-google-cloud-storage/pkg-descr
index 2b54b8daeb4b..29fd1c4b24e2 100644
--- a/www/py-google-cloud-storage/pkg-descr
+++ b/www/py-google-cloud-storage/pkg-descr
@@ -2,4 +2,4 @@ Google Cloud Storage allows you to store data on Google infrastructure with
very high reliability, performance and availability, and can be used to
distribute large data objects to users via direct download.
-WWW: https://pypi.python.org/pypi/google-cloud-storage
+WWW: https://pypi.org/project/google-cloud-storage/
diff --git a/www/py-google-resumable-media/pkg-descr b/www/py-google-resumable-media/pkg-descr
index aec9a882452f..d0826448ab1a 100644
--- a/www/py-google-resumable-media/pkg-descr
+++ b/www/py-google-resumable-media/pkg-descr
@@ -3,4 +3,4 @@ Utilities for Google Media Downloads and Resumable Uploads.
This package has some general purposes modules, e.g. common, but the majority
of the public interface will be contained in subpackages.
-WWW: https://pypi.python.org/pypi/google-resumable-media
+WWW: https://pypi.org/project/google-resumable-media/
diff --git a/www/py-html/pkg-descr b/www/py-html/pkg-descr
index 58dd4a272a34..202c68b505ee 100644
--- a/www/py-html/pkg-descr
+++ b/www/py-html/pkg-descr
@@ -1,3 +1,3 @@
Simple, elegant HTML, XHTML and XML generation.
-WWW: https://pypi.python.org/pypi/html
+WWW: https://pypi.org/project/html/
diff --git a/www/py-hyperlink/pkg-descr b/www/py-hyperlink/pkg-descr
index e78e868d0710..29378b8497b6 100644
--- a/www/py-hyperlink/pkg-descr
+++ b/www/py-hyperlink/pkg-descr
@@ -1,5 +1,5 @@
Hyperlink provides a pure-Python implementation of immutable URLs. Based on RFC
3986 and 3987, the Hyperlink URL makes working with both URIs and IRIs easy.
-WWW: https://pypi.python.org/pypi/hyperlink
+WWW: https://pypi.org/project/hyperlink/
WWW: https://github.com/python-hyper/hyperlink
diff --git a/www/py-libsass/pkg-descr b/www/py-libsass/pkg-descr
index d7dc2ca89db2..b58fc008f7cf 100644
--- a/www/py-libsass/pkg-descr
+++ b/www/py-libsass/pkg-descr
@@ -1,4 +1,4 @@
A simple Python extension module sass which is binding Libsass
(written in C/C++ by Hampton Catlin and Aaron Leung).
-WWW: https://pypi.python.org/pypi/libsass
+WWW: https://pypi.org/project/libsass/
diff --git a/www/py-nevow/pkg-descr b/www/py-nevow/pkg-descr
index 9ad9f1003bd2..1882b15194c7 100644
--- a/www/py-nevow/pkg-descr
+++ b/www/py-nevow/pkg-descr
@@ -12,4 +12,4 @@ error pages if appropriate. Once a form post has validated successfully, the
method will be called with the coerced values.
WWW: https://github.com/twisted/nevow
-WWW: https://pypi.python.org/pypi/Nevow
+WWW: https://pypi.org/project/Nevow/
diff --git a/www/py-pastescript/pkg-descr b/www/py-pastescript/pkg-descr
index 1cc40b3348e4..837c6353574b 100644
--- a/www/py-pastescript/pkg-descr
+++ b/www/py-pastescript/pkg-descr
@@ -12,5 +12,5 @@ It includes some built-in features;
* Serving up web applications, with configuration based on
paste.deploy.
-WWW: https://pypi.python.org/pypi/pastescript
+WWW: https://pypi.org/project/PasteScript/
WWW: http://pythonpaste.org/script/
diff --git a/www/py-planet/pkg-descr b/www/py-planet/pkg-descr
index d8f9e0b646b7..d4aa0db8688a 100644
--- a/www/py-planet/pkg-descr
+++ b/www/py-planet/pkg-descr
@@ -4,4 +4,4 @@ access to Planet's public API easy to use.
The command line interface is intended to be functional for many tasks but is
just a thin layer on the lower level Python API.
-WWW: https://pypi.python.org/pypi/planet
+WWW: https://pypi.org/project/planet/
diff --git a/www/py-plone.alterego/pkg-descr b/www/py-plone.alterego/pkg-descr
index b87a6deaf91d..7a6459aa93e6 100644
--- a/www/py-plone.alterego/pkg-descr
+++ b/www/py-plone.alterego/pkg-descr
@@ -1,4 +1,4 @@
This package defines a dynamic module type that lets you create objects in the
dynamic module on demand.
-WWW: https://pypi.python.org/pypi/plone.alterego
+WWW: https://pypi.org/project/plone.alterego/
diff --git a/www/py-plone.app.blob/pkg-descr b/www/py-plone.app.blob/pkg-descr
index ca707ada40e3..c4e91e6d153f 100644
--- a/www/py-plone.app.blob/pkg-descr
+++ b/www/py-plone.app.blob/pkg-descr
@@ -1,3 +1,3 @@
ZODB blob support for Plone.
-WWW: https://pypi.python.org/pypi/plone.app.blob
+WWW: https://pypi.org/project/plone.app.blob/
diff --git a/www/py-plone.app.caching/pkg-descr b/www/py-plone.app.caching/pkg-descr
index 75a1b8386860..2c493ba4b651 100644
--- a/www/py-plone.app.caching/pkg-descr
+++ b/www/py-plone.app.caching/pkg-descr
@@ -1,3 +1,3 @@
Plone UI and default rules for plone.caching/z3c.caching.
-WWW: https://pypi.python.org/pypi/plone.app.caching
+WWW: https://pypi.org/project/plone.app.caching/
diff --git a/www/py-plone.app.collection/pkg-descr b/www/py-plone.app.collection/pkg-descr
index 9aea9368568d..ce41904d1228 100644
--- a/www/py-plone.app.collection/pkg-descr
+++ b/www/py-plone.app.collection/pkg-descr
@@ -1,4 +1,4 @@
Collections in Plone are the most powerful tool content editors and site
managers have to construct navigation and site sections.
-WWW: https://pypi.python.org/pypi/plone.app.collection
+WWW: https://pypi.org/project/plone.app.collection/
diff --git a/www/py-plone.app.content/pkg-descr b/www/py-plone.app.content/pkg-descr
index 70c20e897e22..f2831a4eb92a 100644
--- a/www/py-plone.app.content/pkg-descr
+++ b/www/py-plone.app.content/pkg-descr
@@ -1,3 +1,3 @@
Content Views for Plone.
-WWW: https://pypi.python.org/pypi/plone.app.content
+WWW: https://pypi.org/project/plone.app.content/
diff --git a/www/py-plone.app.contentlisting/pkg-descr b/www/py-plone.app.contentlisting/pkg-descr
index 239f687a4126..ab63a65eacf8 100644
--- a/www/py-plone.app.contentlisting/pkg-descr
+++ b/www/py-plone.app.contentlisting/pkg-descr
@@ -1,3 +1,3 @@
Listing of content for the Plone CMS.
-WWW: https://pypi.python.org/pypi/plone.app.contentlisting
+WWW: https://pypi.org/project/plone.app.contentlisting/
diff --git a/www/py-plone.app.contentmenu/pkg-descr b/www/py-plone.app.contentmenu/pkg-descr
index 23dc6bada518..837e25adb4b2 100644
--- a/www/py-plone.app.contentmenu/pkg-descr
+++ b/www/py-plone.app.contentmenu/pkg-descr
@@ -1,3 +1,3 @@
Plone's content menu implementation.
-WWW: https://pypi.python.org/pypi/plone.app.contentmenu
+WWW: https://pypi.org/project/plone.app.contentmenu/
diff --git a/www/py-plone.app.contentrules/pkg-descr b/www/py-plone.app.contentrules/pkg-descr
index f6b8900be594..fd7ef7557288 100644
--- a/www/py-plone.app.contentrules/pkg-descr
+++ b/www/py-plone.app.contentrules/pkg-descr
@@ -1,3 +1,3 @@
Plone integration for plone.contentrules.
-WWW: https://pypi.python.org/pypi/plone.app.contentrules
+WWW: https://pypi.org/project/plone.app.contentrules/
diff --git a/www/py-plone.app.controlpanel/pkg-descr b/www/py-plone.app.controlpanel/pkg-descr
index 9bcd9fe1f223..3954aca18d2c 100644
--- a/www/py-plone.app.controlpanel/pkg-descr
+++ b/www/py-plone.app.controlpanel/pkg-descr
@@ -1,3 +1,3 @@
Formlib-based controlpanels for Plone.
-WWW: https://pypi.python.org/pypi/plone.app.controlpanel
+WWW: https://pypi.org/project/plone.app.controlpanel/
diff --git a/www/py-plone.app.customerize/pkg-descr b/www/py-plone.app.customerize/pkg-descr
index ac9205bf1be9..5dcfa03e1a6d 100644
--- a/www/py-plone.app.customerize/pkg-descr
+++ b/www/py-plone.app.customerize/pkg-descr
@@ -1,3 +1,3 @@
Integrate five.customerize into Plone.
-WWW: https://pypi.python.org/pypi/plone.app.customerize
+WWW: https://pypi.org/project/plone.app.customerize/
diff --git a/www/py-plone.app.discussion/pkg-descr b/www/py-plone.app.discussion/pkg-descr
index 01ce4f9c0cd8..5799ee548f81 100644
--- a/www/py-plone.app.discussion/pkg-descr
+++ b/www/py-plone.app.discussion/pkg-descr
@@ -1,3 +1,3 @@
Enhanced discussion support for Plone.
-WWW: https://pypi.python.org/pypi/plone.app.discussion
+WWW: https://pypi.org/project/plone.app.discussion/
diff --git a/www/py-plone.app.folder/pkg-descr b/www/py-plone.app.folder/pkg-descr
index 9817bc856099..2dd50e07c3d5 100644
--- a/www/py-plone.app.folder/pkg-descr
+++ b/www/py-plone.app.folder/pkg-descr
@@ -1,3 +1,3 @@
Integration package for `plone.folder` into Plone.
-WWW: https://pypi.python.org/pypi/plone.app.folder
+WWW: https://pypi.org/project/plone.app.folder/
diff --git a/www/py-plone.app.form/pkg-descr b/www/py-plone.app.form/pkg-descr
index 5d379e5ae8bc..94de143b5711 100644
--- a/www/py-plone.app.form/pkg-descr
+++ b/www/py-plone.app.form/pkg-descr
@@ -1,3 +1,3 @@
zope.formlib integration for Plone.
-WWW: https://pypi.python.org/pypi/plone.app.form
+WWW: https://pypi.org/project/plone.app.form/
diff --git a/www/py-plone.app.i18n/pkg-descr b/www/py-plone.app.i18n/pkg-descr
index 85f4fb852897..9866d61020ad 100644
--- a/www/py-plone.app.i18n/pkg-descr
+++ b/www/py-plone.app.i18n/pkg-descr
@@ -1,3 +1,3 @@
Plone specific i18n extensions.
-WWW: https://pypi.python.org/pypi/plone.app.i18n
+WWW: https://pypi.org/project/plone.app.i18n/
diff --git a/www/py-plone.app.imaging/pkg-descr b/www/py-plone.app.imaging/pkg-descr
index 6f6048b6f21e..c2e96f80b5f3 100644
--- a/www/py-plone.app.imaging/pkg-descr
+++ b/www/py-plone.app.imaging/pkg-descr
@@ -1,3 +1,3 @@
User-configurable, blob-aware image scaling for Plone.
-WWW: https://pypi.python.org/pypi/plone.app.imaging
+WWW: https://pypi.org/project/plone.app.imaging/
diff --git a/www/py-plone.app.iterate/pkg-descr b/www/py-plone.app.iterate/pkg-descr
index f38598760f16..8ed63f40562b 100644
--- a/www/py-plone.app.iterate/pkg-descr
+++ b/www/py-plone.app.iterate/pkg-descr
@@ -1,3 +1,3 @@
Check-out/check-in staging for Plone.
-WWW: https://pypi.python.org/pypi/plone.app.iterate
+WWW: https://pypi.org/project/plone.app.iterate/
diff --git a/www/py-plone.app.jquery/pkg-descr b/www/py-plone.app.jquery/pkg-descr
index a1d936c2e596..8b4542f76af7 100644
--- a/www/py-plone.app.jquery/pkg-descr
+++ b/www/py-plone.app.jquery/pkg-descr
@@ -1,3 +1,3 @@
plone.app.jquery adds jquery library to Plone.
-WWW: https://pypi.python.org/pypi/plone.app.jquery
+WWW: https://pypi.org/project/plone.app.jquery/
diff --git a/www/py-plone.app.jquerytools/pkg-descr b/www/py-plone.app.jquerytools/pkg-descr
index d2dc86863865..2eae0fdbaa8a 100644
--- a/www/py-plone.app.jquerytools/pkg-descr
+++ b/www/py-plone.app.jquerytools/pkg-descr
@@ -1,3 +1,3 @@
jQuery Tools integration for Plone plus overlay and AJAX form helpers.
-WWW: https://pypi.python.org/pypi/plone.app.jquerytools
+WWW: https://pypi.org/project/plone.app.jquerytools/
diff --git a/www/py-plone.app.layout/pkg-descr b/www/py-plone.app.layout/pkg-descr
index 4cda670f41b6..60ea5bc4c5b0 100644
--- a/www/py-plone.app.layout/pkg-descr
+++ b/www/py-plone.app.layout/pkg-descr
@@ -1,3 +1,3 @@
Layout mechanisms for Plone.
-WWW: https://pypi.python.org/pypi/plone.app.layout
+WWW: https://pypi.org/project/plone.app.layout/
diff --git a/www/py-plone.app.ldap/pkg-descr b/www/py-plone.app.ldap/pkg-descr
index eb1e8d4c55d4..02aa6d19ea65 100644
--- a/www/py-plone.app.ldap/pkg-descr
+++ b/www/py-plone.app.ldap/pkg-descr
@@ -1,3 +1,3 @@
LDAP control panel for Plone.
-WWW: https://pypi.python.org/pypi/plone.app.ldap
+WWW: https://pypi.org/project/plone.app.ldap/
diff --git a/www/py-plone.app.linkintegrity/pkg-descr b/www/py-plone.app.linkintegrity/pkg-descr
index e4aaf69f5a7c..4a86716ff417 100644
--- a/www/py-plone.app.linkintegrity/pkg-descr
+++ b/www/py-plone.app.linkintegrity/pkg-descr
@@ -1,3 +1,3 @@
Manage link integrity in Plone.
-WWW: https://pypi.python.org/pypi/plone.app.linkintegrity
+WWW: https://pypi.org/project/plone.app.linkintegrity/
diff --git a/www/py-plone.app.locales/pkg-descr b/www/py-plone.app.locales/pkg-descr
index 1b5e01130e25..91d7272a9b3f 100644
--- a/www/py-plone.app.locales/pkg-descr
+++ b/www/py-plone.app.locales/pkg-descr
@@ -1,3 +1,3 @@
Translation files for Plone.
-WWW: https://pypi.python.org/pypi/plone.app.locales
+WWW: https://pypi.org/project/plone.app.locales/
diff --git a/www/py-plone.app.portlets/pkg-descr b/www/py-plone.app.portlets/pkg-descr
index 4035a712d947..86f5cef290a2 100644
--- a/www/py-plone.app.portlets/pkg-descr
+++ b/www/py-plone.app.portlets/pkg-descr
@@ -1,3 +1,3 @@
Plone integration for the basic plone.portlets package.
-WWW: https://pypi.python.org/pypi/plone.app.portlets
+WWW: https://pypi.org/project/plone.app.portlets/
diff --git a/www/py-plone.app.querystring/pkg-descr b/www/py-plone.app.querystring/pkg-descr
index 330c4e478546..01f8fed6e977 100644
--- a/www/py-plone.app.querystring/pkg-descr
+++ b/www/py-plone.app.querystring/pkg-descr
@@ -3,4 +3,4 @@ to parse stored queries to actual results, used in new style collections.
It includes a registry reader which reads operators, values and criteria
from the Plone registry.
-WWW: https://pypi.python.org/pypi/plone.app.querystring
+WWW: https://pypi.org/project/plone.app.querystring/
diff --git a/www/py-plone.app.redirector/pkg-descr b/www/py-plone.app.redirector/pkg-descr
index 4612234e2d2f..b0d56e1a0e53 100644
--- a/www/py-plone.app.redirector/pkg-descr
+++ b/www/py-plone.app.redirector/pkg-descr
@@ -1,3 +1,3 @@
Redirection tool.
-WWW: https://pypi.python.org/pypi/plone.app.redirector
+WWW: https://pypi.org/project/plone.app.redirector/
diff --git a/www/py-plone.app.registry/pkg-descr b/www/py-plone.app.registry/pkg-descr
index 7b14c71e022e..cc54ceec49f5 100644
--- a/www/py-plone.app.registry/pkg-descr
+++ b/www/py-plone.app.registry/pkg-descr
@@ -1,3 +1,3 @@
Zope 2 and Plone integration for plone.registry.
-WWW: https://pypi.python.org/pypi/plone.app.registry
+WWW: https://pypi.org/project/plone.app.registry/
diff --git a/www/py-plone.app.search/pkg-descr b/www/py-plone.app.search/pkg-descr
index 468cc18ac4d2..c09d9f8269db 100644
--- a/www/py-plone.app.search/pkg-descr
+++ b/www/py-plone.app.search/pkg-descr
@@ -1,3 +1,3 @@
Search user interface for Plone CMS.
-WWW: https://pypi.python.org/pypi/plone.app.search
+WWW: https://pypi.org/project/plone.app.search/
diff --git a/www/py-plone.app.testing/pkg-descr b/www/py-plone.app.testing/pkg-descr
index 42a4f11763bc..38dd8b4dc659 100644
--- a/www/py-plone.app.testing/pkg-descr
+++ b/www/py-plone.app.testing/pkg-descr
@@ -1,3 +1,3 @@
Testing tools for Plone-the-application, based on plone.testing.
-WWW: https://pypi.python.org/pypi/plone.app.testing
+WWW: https://pypi.org/project/plone.app.testing/
diff --git a/www/py-plone.app.textfield/pkg-descr b/www/py-plone.app.textfield/pkg-descr
index c8e37f8b9cee..8d788345c803 100644
--- a/www/py-plone.app.textfield/pkg-descr
+++ b/www/py-plone.app.textfield/pkg-descr
@@ -3,4 +3,4 @@ can be used to store a value with a related MIME type. The value can be
transformed to an output MIME type, for example to transform from structured
text to HTML.
-WWW: https://pypi.python.org/pypi/plone.app.textfield
+WWW: https://pypi.org/project/plone.app.textfield/
diff --git a/www/py-plone.app.theming/pkg-descr b/www/py-plone.app.theming/pkg-descr
index c8e2d5f84064..1434b6663180 100644
--- a/www/py-plone.app.theming/pkg-descr
+++ b/www/py-plone.app.theming/pkg-descr
@@ -1,3 +1,3 @@
Integrates the Diazo theming engine with Plone.
-WWW: https://pypi.python.org/pypi/plone.app.theming
+WWW: https://pypi.org/project/plone.app.theming/
diff --git a/www/py-plone.app.upgrade/pkg-descr b/www/py-plone.app.upgrade/pkg-descr
index 72aad1c0672e..708bf78fde93 100644
--- a/www/py-plone.app.upgrade/pkg-descr
+++ b/www/py-plone.app.upgrade/pkg-descr
@@ -1,3 +1,3 @@
Upgrade machinery for Plone.
-WWW: https://pypi.python.org/pypi/plone.app.upgrade
+WWW: https://pypi.org/project/plone.app.upgrade/
diff --git a/www/py-plone.app.users/pkg-descr b/www/py-plone.app.users/pkg-descr
index 6a836019725c..56f04dcfbc0a 100644
--- a/www/py-plone.app.users/pkg-descr
+++ b/www/py-plone.app.users/pkg-descr
@@ -1,3 +1,3 @@
A package for all things users and groups related (specific to plone).
-WWW: https://pypi.python.org/pypi/plone.app.users
+WWW: https://pypi.org/project/plone.app.users/
diff --git a/www/py-plone.app.uuid/pkg-descr b/www/py-plone.app.uuid/pkg-descr
index 52df8ba0534d..b94a125d0459 100644
--- a/www/py-plone.app.uuid/pkg-descr
+++ b/www/py-plone.app.uuid/pkg-descr
@@ -1,3 +1,3 @@
Plone integration for the basic plone.uuid package.
-WWW: https://pypi.python.org/pypi/plone.app.uuid
+WWW: https://pypi.org/project/plone.app.uuid/
diff --git a/www/py-plone.app.viewletmanager/pkg-descr b/www/py-plone.app.viewletmanager/pkg-descr
index 3708f66f421b..e9a58d85bf50 100644
--- a/www/py-plone.app.viewletmanager/pkg-descr
+++ b/www/py-plone.app.viewletmanager/pkg-descr
@@ -1,3 +1,3 @@
Configurable viewlet manager.
-WWW: https://pypi.python.org/pypi/plone.app.viewletmanager
+WWW: https://pypi.org/project/plone.app.viewletmanager/
diff --git a/www/py-plone.app.vocabularies/pkg-descr b/www/py-plone.app.vocabularies/pkg-descr
index a48f4954a515..d1a255ec656f 100644
--- a/www/py-plone.app.vocabularies/pkg-descr
+++ b/www/py-plone.app.vocabularies/pkg-descr
@@ -1,3 +1,3 @@
A collection of generally useful vocabularies.
-WWW: https://pypi.python.org/pypi/plone.app.vocabularies
+WWW: https://pypi.org/project/plone.app.vocabularies/
diff --git a/www/py-plone.app.workflow/pkg-descr b/www/py-plone.app.workflow/pkg-descr
index fa8fb02cc907..df1e47e40691 100644
--- a/www/py-plone.app.workflow/pkg-descr
+++ b/www/py-plone.app.workflow/pkg-descr
@@ -1,3 +1,3 @@
Workflow and security settings for Plone.
-WWW: https://pypi.python.org/pypi/plone.app.workflow
+WWW: https://pypi.org/project/plone.app.workflow/
diff --git a/www/py-plone.app.z3cform/pkg-descr b/www/py-plone.app.z3cform/pkg-descr
index f40acf1b813b..13fcfae62685 100644
--- a/www/py-plone.app.z3cform/pkg-descr
+++ b/www/py-plone.app.z3cform/pkg-descr
@@ -1,4 +1,4 @@
A collection of widgets, templates and other components for use with z3c.form
and Plone.
-WWW: https://pypi.python.org/pypi/plone.app.z3cform
+WWW: https://pypi.org/project/plone.app.z3cform/
diff --git a/www/py-plone.autoform/pkg-descr b/www/py-plone.autoform/pkg-descr
index cb746abd0365..94907e45759d 100644
--- a/www/py-plone.autoform/pkg-descr
+++ b/www/py-plone.autoform/pkg-descr
@@ -1,3 +1,3 @@
Tools to construct z3c.form forms.
-WWW: https://pypi.python.org/pypi/plone.autoform
+WWW: https://pypi.org/project/plone.autoform/
diff --git a/www/py-plone.batching/pkg-descr b/www/py-plone.batching/pkg-descr
index 6b699b797ce8..0adb8f4c199c 100644
--- a/www/py-plone.batching/pkg-descr
+++ b/www/py-plone.batching/pkg-descr
@@ -1,3 +1,3 @@
Batching facilities used in Plone.
-WWW: https://pypi.python.org/pypi/plone.batching
+WWW: https://pypi.org/project/plone.batching/
diff --git a/www/py-plone.behavior/pkg-descr b/www/py-plone.behavior/pkg-descr
index c40305ad8485..53c97c214803 100644
--- a/www/py-plone.behavior/pkg-descr
+++ b/www/py-plone.behavior/pkg-descr
@@ -2,4 +2,4 @@ This package provides optional support for "behaviors". A behavior is
a re-usable aspect of an object that can be enabled or disabled without
changing the component registry.
-WWW: https://pypi.python.org/pypi/plone.behavior
+WWW: https://pypi.org/project/plone.behavior/
diff --git a/www/py-plone.browserlayer/pkg-descr b/www/py-plone.browserlayer/pkg-descr
index 6ff855098546..86c13bad3cb4 100644
--- a/www/py-plone.browserlayer/pkg-descr
+++ b/www/py-plone.browserlayer/pkg-descr
@@ -1,3 +1,3 @@
Browser layer management for Zope 2 applications.
-WWW: https://pypi.python.org/pypi/plone.browserlayer
+WWW: https://pypi.org/project/plone.browserlayer/
diff --git a/www/py-plone.cachepurging/pkg-descr b/www/py-plone.cachepurging/pkg-descr
index b7595355c415..f9b85fe7a189 100644
--- a/www/py-plone.cachepurging/pkg-descr
+++ b/www/py-plone.cachepurging/pkg-descr
@@ -1,3 +1,3 @@
Cache purging support for Zope 2 applications.
-WWW: https://pypi.python.org/pypi/plone.cachepurging
+WWW: https://pypi.org/project/plone.cachepurging/
diff --git a/www/py-plone.caching/pkg-descr b/www/py-plone.caching/pkg-descr
index b030d5fcd30c..e03223dbe3d1 100644
--- a/www/py-plone.caching/pkg-descr
+++ b/www/py-plone.caching/pkg-descr
@@ -1,3 +1,3 @@
Zope 2 integration for z3c.caching.
-WWW: https://pypi.python.org/pypi/plone.caching
+WWW: https://pypi.org/project/plone.caching/
diff --git a/www/py-plone.contentrules/pkg-descr b/www/py-plone.contentrules/pkg-descr
index e1cdf9c69977..d968ce3e435f 100644
--- a/www/py-plone.contentrules/pkg-descr
+++ b/www/py-plone.contentrules/pkg-descr
@@ -1,3 +1,3 @@
Plone ContentRules Engine.
-WWW: https://pypi.python.org/pypi/plone.contentrules
+WWW: https://pypi.org/project/plone.contentrules/
diff --git a/www/py-plone.fieldsets/pkg-descr b/www/py-plone.fieldsets/pkg-descr
index 70ccddf8a8aa..aceb3586d4be 100644
--- a/www/py-plone.fieldsets/pkg-descr
+++ b/www/py-plone.fieldsets/pkg-descr
@@ -1,4 +1,4 @@
An extension to zope.formlib, which allows to group fields into different
fieldsets.
-WWW: https://pypi.python.org/pypi/plone.fieldsets
+WWW: https://pypi.org/project/plone.fieldsets/
diff --git a/www/py-plone.folder/pkg-descr b/www/py-plone.folder/pkg-descr
index b76ad3da9a88..42dfd3093124 100644
--- a/www/py-plone.folder/pkg-descr
+++ b/www/py-plone.folder/pkg-descr
@@ -1,3 +1,3 @@
BTree-based folder implementation with order support.
-WWW: https://pypi.python.org/pypi/plone.folder
+WWW: https://pypi.org/project/plone.folder/
diff --git a/www/py-plone.formwidget.namedfile/pkg-descr b/www/py-plone.formwidget.namedfile/pkg-descr
index 486b64bc5c8c..bea61ff2c04c 100644
--- a/www/py-plone.formwidget.namedfile/pkg-descr
+++ b/www/py-plone.formwidget.namedfile/pkg-descr
@@ -1,4 +1,4 @@
This package provides z3c.form widgets for file and image upload/download,
with the option of keeping the existing file or replacing it with a new one.
-WWW: https://pypi.python.org/pypi/plone.formwidget.namedfile
+WWW: https://pypi.org/project/plone.formwidget.namedfile/
diff --git a/www/py-plone.i18n/pkg-descr b/www/py-plone.i18n/pkg-descr
index e55ef756cd41..d3d8e79e490a 100644
--- a/www/py-plone.i18n/pkg-descr
+++ b/www/py-plone.i18n/pkg-descr
@@ -1,3 +1,3 @@
Advanced i18n/l10n features.
-WWW: https://pypi.python.org/pypi/plone.i18n
+WWW: https://pypi.org/project/plone.i18n/
diff --git a/www/py-plone.indexer/pkg-descr b/www/py-plone.indexer/pkg-descr
index eb92ad330126..99510f17e9a2 100644
--- a/www/py-plone.indexer/pkg-descr
+++ b/www/py-plone.indexer/pkg-descr
@@ -1,3 +1,3 @@
Hooks to facilitate managing custom index values in Zope 2/CMF applications.
-WWW: https://pypi.python.org/pypi/plone.indexer
+WWW: https://pypi.org/project/plone.indexer/
diff --git a/www/py-plone.intelligenttext/pkg-descr b/www/py-plone.intelligenttext/pkg-descr
index b9f4553d0287..24350082a897 100644
--- a/www/py-plone.intelligenttext/pkg-descr
+++ b/www/py-plone.intelligenttext/pkg-descr
@@ -1,3 +1,3 @@
Provides transforms from text/x-web-intelligent to text/html and vice versa.
-WWW: https://pypi.python.org/pypi/plone.intelligenttext
+WWW: https://pypi.org/project/plone.intelligenttext/
diff --git a/www/py-plone.locking/pkg-descr b/www/py-plone.locking/pkg-descr
index 4bb78f297941..0bc32579b105 100644
--- a/www/py-plone.locking/pkg-descr
+++ b/www/py-plone.locking/pkg-descr
@@ -1,3 +1,3 @@
WebDAV locking support.
-WWW: https://pypi.python.org/pypi/plone.locking
+WWW: https://pypi.org/project/plone.locking/
diff --git a/www/py-plone.memoize/pkg-descr b/www/py-plone.memoize/pkg-descr
index 7a3812b46dfd..67046c5d1248 100644
--- a/www/py-plone.memoize/pkg-descr
+++ b/www/py-plone.memoize/pkg-descr
@@ -1,3 +1,3 @@
Decorators for caching the values of functions and methods.
-WWW: https://pypi.python.org/pypi/plone.memoize
+WWW: https://pypi.org/project/plone.memoize/
diff --git a/www/py-plone.namedfile/pkg-descr b/www/py-plone.namedfile/pkg-descr
index ff176b12ea7a..3dcd6cb9dc7b 100644
--- a/www/py-plone.namedfile/pkg-descr
+++ b/www/py-plone.namedfile/pkg-descr
@@ -3,4 +3,4 @@ This package contains fields and wrapper objects for storing:
* A file with a filename
* An image with a filename
-WWW: https://pypi.python.org/pypi/plone.namedfile
+WWW: https://pypi.org/project/plone.namedfile/
diff --git a/www/py-plone.outputfilters/pkg-descr b/www/py-plone.outputfilters/pkg-descr
index 5e742c40c802..ce28f5a59673 100644
--- a/www/py-plone.outputfilters/pkg-descr
+++ b/www/py-plone.outputfilters/pkg-descr
@@ -1,3 +1,3 @@
Transformations applied to HTML in Plone text fields as they are rendered.
-WWW: https://pypi.python.org/pypi/plone.outputfilters
+WWW: https://pypi.org/project/plone.outputfilters/
diff --git a/www/py-plone.portlet.collection/pkg-descr b/www/py-plone.portlet.collection/pkg-descr
index be70764639fa..6fa8635089b9 100644
--- a/www/py-plone.portlet.collection/pkg-descr
+++ b/www/py-plone.portlet.collection/pkg-descr
@@ -1,3 +1,3 @@
A portlet that fetches results from a collection.
-WWW: https://pypi.python.org/pypi/plone.portlet.collection
+WWW: https://pypi.org/project/plone.portlet.collection/
diff --git a/www/py-plone.portlet.static/pkg-descr b/www/py-plone.portlet.static/pkg-descr
index 0d7c44638818..2d6bfd1bf2b4 100644
--- a/www/py-plone.portlet.static/pkg-descr
+++ b/www/py-plone.portlet.static/pkg-descr
@@ -1,3 +1,3 @@
A simple static HTML portlet for Plone.
-WWW: https://pypi.python.org/pypi/plone.portlet.static
+WWW: https://pypi.org/project/plone.portlet.static/
diff --git a/www/py-plone.portlets/pkg-descr b/www/py-plone.portlets/pkg-descr
index 8ec0f604bf44..3a2d4799c700 100644
--- a/www/py-plone.portlets/pkg-descr
+++ b/www/py-plone.portlets/pkg-descr
@@ -1,3 +1,3 @@
An extension of zope.viewlet to support dynamic portlets.
-WWW: https://pypi.python.org/pypi/plone.portlets
+WWW: https://pypi.org/project/plone.portlets/
diff --git a/www/py-plone.registry/pkg-descr b/www/py-plone.registry/pkg-descr
index 487de74f0e02..7d4c1f67db31 100644
--- a/www/py-plone.registry/pkg-descr
+++ b/www/py-plone.registry/pkg-descr
@@ -1,3 +1,3 @@
A debconf-like (or about:config-like) registry for storing application settings.
-WWW: https://pypi.python.org/pypi/plone.registry
+WWW: https://pypi.org/project/plone.registry/
diff --git a/www/py-plone.resource/pkg-descr b/www/py-plone.resource/pkg-descr
index 3312d877de13..d582e437bf95 100644
--- a/www/py-plone.resource/pkg-descr
+++ b/www/py-plone.resource/pkg-descr
@@ -2,4 +2,4 @@ plone.resource publishes directories of static files via the ZPublisher. These
directories may be located either in the ZODB (as OFS folders and files), or on
the filesystem.
-WWW: https://pypi.python.org/pypi/plone.resource
+WWW: https://pypi.org/project/plone.resource/
diff --git a/www/py-plone.rfc822/pkg-descr b/www/py-plone.rfc822/pkg-descr
index fa7efd81cf61..6f3d880e759a 100644
--- a/www/py-plone.rfc822/pkg-descr
+++ b/www/py-plone.rfc822/pkg-descr
@@ -2,4 +2,4 @@ This package provides primitives for turning content objects described by
``zope.schema`` fields into RFC (2)822 style messages, as managed by the
Python standard library's ``email`` module.
-WWW: https://pypi.python.org/pypi/plone.rfc822
+WWW: https://pypi.org/project/plone.rfc822/
diff --git a/www/py-plone.scale/pkg-descr b/www/py-plone.scale/pkg-descr
index ccf0dc60bf81..395e35738d52 100644
--- a/www/py-plone.scale/pkg-descr
+++ b/www/py-plone.scale/pkg-descr
@@ -1,3 +1,3 @@
Image scaling.
-WWW: https://pypi.python.org/pypi/plone.scale
+WWW: https://pypi.org/project/plone.scale/
diff --git a/www/py-plone.stringinterp/pkg-descr b/www/py-plone.stringinterp/pkg-descr
index 9b9e32df2c22..e2fc9cd11259 100644
--- a/www/py-plone.stringinterp/pkg-descr
+++ b/www/py-plone.stringinterp/pkg-descr
@@ -1,3 +1,3 @@
Adaptable string interpolation.
-WWW: https://pypi.python.org/pypi/plone.stringinterp
+WWW: https://pypi.org/project/plone.stringinterp/
diff --git a/www/py-plone.subrequest/pkg-descr b/www/py-plone.subrequest/pkg-descr
index 4bdd2cc23a6c..00f95186bd21 100644
--- a/www/py-plone.subrequest/pkg-descr
+++ b/www/py-plone.subrequest/pkg-descr
@@ -1,3 +1,3 @@
Subrequests for Zope2.
-WWW: https://pypi.python.org/pypi/plone.subrequest
+WWW: https://pypi.org/project/plone.subrequest/
diff --git a/www/py-plone.supermodel/pkg-descr b/www/py-plone.supermodel/pkg-descr
index 199fda761fcc..51dfcb267e07 100644
--- a/www/py-plone.supermodel/pkg-descr
+++ b/www/py-plone.supermodel/pkg-descr
@@ -1,3 +1,3 @@
Serialize Zope schema definitions to and from XML.
-WWW: https://pypi.python.org/pypi/plone.supermodel
+WWW: https://pypi.org/project/plone.supermodel/
diff --git a/www/py-plone.synchronize/pkg-descr b/www/py-plone.synchronize/pkg-descr
index f17889ad8f44..a10a7154152a 100644
--- a/www/py-plone.synchronize/pkg-descr
+++ b/www/py-plone.synchronize/pkg-descr
@@ -1,4 +1,4 @@
This package provides a simple decorator to help synchronize methods across
threads, to avoid problems of concurrent access.
-WWW: https://pypi.python.org/pypi/plone.synchronize
+WWW: https://pypi.org/project/plone.synchronize/
diff --git a/www/py-plone.theme/pkg-descr b/www/py-plone.theme/pkg-descr
index 3c9b923983ae..573079b8c4d0 100644
--- a/www/py-plone.theme/pkg-descr
+++ b/www/py-plone.theme/pkg-descr
@@ -1,3 +1,3 @@
Tools for managing themes in CMF and Plone sites.
-WWW: https://pypi.python.org/pypi/plone.theme
+WWW: https://pypi.org/project/plone.theme/
diff --git a/www/py-plone.transformchain/pkg-descr b/www/py-plone.transformchain/pkg-descr
index df2ab699c4a4..0af6a5b12a91 100644
--- a/www/py-plone.transformchain/pkg-descr
+++ b/www/py-plone.transformchain/pkg-descr
@@ -2,4 +2,4 @@ Hook into repoze.zope2 that allows third party packages to register a sequence
of hooks that will be allowed to modify the response before it is returned to
the browser.
-WWW: https://pypi.python.org/pypi/plone.transformchain
+WWW: https://pypi.org/project/plone.transformchain/
diff --git a/www/py-plone.uuid/pkg-descr b/www/py-plone.uuid/pkg-descr
index 31e76fa24eaa..3cb1e688ab6d 100644
--- a/www/py-plone.uuid/pkg-descr
+++ b/www/py-plone.uuid/pkg-descr
@@ -1,3 +1,3 @@
UUIDs for content items.
-WWW: https://pypi.python.org/pypi/plone.uuid
+WWW: https://pypi.org/project/plone.uuid/
diff --git a/www/py-plone.z3cform/pkg-descr b/www/py-plone.z3cform/pkg-descr
index 33cb2ecb95e7..4d6746767b36 100644
--- a/www/py-plone.z3cform/pkg-descr
+++ b/www/py-plone.z3cform/pkg-descr
@@ -1,3 +1,3 @@
plone.z3cform is a library that allows use of z3c.form with Zope 2 and the CMF.
-WWW: https://pypi.python.org/pypi/plone.z3cform
+WWW: https://pypi.org/project/plone.z3cform/
diff --git a/www/py-plonetheme.classic/pkg-descr b/www/py-plonetheme.classic/pkg-descr
index 2d594d76170a..42e9924a8ca8 100644
--- a/www/py-plonetheme.classic/pkg-descr
+++ b/www/py-plonetheme.classic/pkg-descr
@@ -1,3 +1,3 @@
The classic Plone 3 default theme.
-WWW: https://pypi.python.org/pypi/plonetheme.classic
+WWW: https://pypi.org/project/plonetheme.classic/
diff --git a/www/py-plonetheme.sunburst/pkg-descr b/www/py-plonetheme.sunburst/pkg-descr
index c71c29c61889..4e2cfc32ce6d 100644
--- a/www/py-plonetheme.sunburst/pkg-descr
+++ b/www/py-plonetheme.sunburst/pkg-descr
@@ -1,3 +1,3 @@
The default theme for Plone 4.
-WWW: https://pypi.python.org/pypi/plonetheme.sunburst
+WWW: https://pypi.org/project/plonetheme.sunburst/
diff --git a/www/py-pyquery/pkg-descr b/www/py-pyquery/pkg-descr
index 99440c53be19..7a4cf63c3d8e 100644
--- a/www/py-pyquery/pkg-descr
+++ b/www/py-pyquery/pkg-descr
@@ -2,4 +2,4 @@ pyquery allows you to make jquery queries on XML documents.
The API is as much as possible the similar to jquery (http://jquery.com).
pyquery uses lxml for fast XML and HTML manipulation.
-WWW: https://pypi.python.org/pypi/pyquery
+WWW: https://pypi.org/project/pyquery/
diff --git a/www/py-pyramid_rpc/pkg-descr b/www/py-pyramid_rpc/pkg-descr
index 08d0e0120b61..4522d42881ea 100644
--- a/www/py-pyramid_rpc/pkg-descr
+++ b/www/py-pyramid_rpc/pkg-descr
@@ -1,4 +1,4 @@
pyramid_rpc is a package of RPC related add-on's to make it easier to
create RPC services.
-WWW: https://pypi.python.org/pypi/pyramid_rpc
+WWW: https://pypi.org/project/pyramid_rpc/
diff --git a/www/py-python-dotenv/pkg-descr b/www/py-python-dotenv/pkg-descr
index 10881f02ac45..9b99b14d3290 100644
--- a/www/py-python-dotenv/pkg-descr
+++ b/www/py-python-dotenv/pkg-descr
@@ -2,5 +2,5 @@ python-dotenv reads the key,value pair from .env and adds them to environment
variable. It is great of managing app settings during development and in
production using 12-factor principles.
-WWW: https://pypi.python.org/pypi/python-dotenv
+WWW: https://pypi.org/project/python-dotenv/
WWW: https://github.com/theskumar/python-dotenv
diff --git a/www/py-recaptcha/pkg-descr b/www/py-recaptcha/pkg-descr
index 9018b1dfe397..957e22e77c71 100644
--- a/www/py-recaptcha/pkg-descr
+++ b/www/py-recaptcha/pkg-descr
@@ -5,4 +5,4 @@ requires pycrypto. This library requires two types of API keys. If you'd like
to use the CAPTCHA, you'll need a key from http://recaptcha.net/api/getkey.
For Mailhide, you'll need a key from http://mailhide.recaptcha.net/apikey.
-WWW: https://pypi.python.org/pypi/recaptcha-client
+WWW: https://pypi.org/project/recaptcha-client/
diff --git a/www/py-requests-mock/pkg-descr b/www/py-requests-mock/pkg-descr
index e694ef777a27..75ddbdf67a95 100644
--- a/www/py-requests-mock/pkg-descr
+++ b/www/py-requests-mock/pkg-descr
@@ -1,4 +1,4 @@
requests-mock provides a building block to stub out the HTTP requests portions
of your testing code.
-WWW: https://pypi.python.org/pypi/requests-mock
+WWW: https://pypi.org/project/requests-mock/
diff --git a/www/py-rfc3987/pkg-descr b/www/py-rfc3987/pkg-descr
index 1536f333d06b..1df4af6c6aa4 100644
--- a/www/py-rfc3987/pkg-descr
+++ b/www/py-rfc3987/pkg-descr
@@ -6,4 +6,4 @@ resolution of references.
* http://tools.ietf.org/html/rfc3986
* http://tools.ietf.org/html/rfc3987
-WWW: https://pypi.python.org/pypi/rfc3987
+WWW: https://pypi.org/project/rfc3987/
diff --git a/www/py-selector/pkg-descr b/www/py-selector/pkg-descr
index c0c24b275d0c..ae2a5416cd87 100644
--- a/www/py-selector/pkg-descr
+++ b/www/py-selector/pkg-descr
@@ -9,5 +9,5 @@ expressions directly or even create our own mini-language. There is a simple
features (to MVC or whatever). Neither are there any framework specific
features.
-WWW: https://pypi.python.org/pypi/selector
+WWW: https://pypi.org/project/selector/
WWW: https://github.com/lukearno/selector
diff --git a/www/py-sockjs-tornado/pkg-descr b/www/py-sockjs-tornado/pkg-descr
index 3e2742c950ff..2094c115b326 100644
--- a/www/py-sockjs-tornado/pkg-descr
+++ b/www/py-sockjs-tornado/pkg-descr
@@ -1,4 +1,4 @@
SockJS-tornado is a Python server side counterpart of SockJS-client browser
library running on top of Tornado framework.
-WWW: https://pypi.python.org/pypi/sockjs-tornado
+WWW: https://pypi.org/project/sockjs-tornado/
diff --git a/www/py-spyne/pkg-descr b/www/py-spyne/pkg-descr
index 56c3fa649103..3667fee46095 100644
--- a/www/py-spyne/pkg-descr
+++ b/www/py-spyne/pkg-descr
@@ -4,5 +4,5 @@ have a well-defined API using multiple protocols and transports.
It integrates with popular Python web frameworks as well as libraries like
SQLAlchemy to keep your code as DRY (Don't Repeat Yourself) as possible.
-WWW: https://pypi.python.org/pypi/spyne
+WWW: https://pypi.org/project/spyne/
WWW: http://spyne.io/
diff --git a/www/py-swapper/pkg-descr b/www/py-swapper/pkg-descr
index dbb5559d1ef3..dddfd9074360 100644
--- a/www/py-swapper/pkg-descr
+++ b/www/py-swapper/pkg-descr
@@ -2,5 +2,5 @@ Swapper is an unofficial API for the undocumented but very powerful Django
feature: swappable models. Swapper facilitates implementing arbitrary swappable
models in your own reusable apps.
-WWW: https://pypi.python.org/pypi/swapper
+WWW: https://pypi.org/project/swapper/
WWW: https://github.com/wq/django-swappable-models
diff --git a/www/py-tmdb3/pkg-descr b/www/py-tmdb3/pkg-descr
index 1b19318aec47..61d368fd65c0 100644
--- a/www/py-tmdb3/pkg-descr
+++ b/www/py-tmdb3/pkg-descr
@@ -1,3 +1,3 @@
TheMovieDB.org APIv3 interface
-WWW: https://pypi.python.org/pypi/tmdb3
+WWW: https://pypi.org/project/tmdb3/
diff --git a/www/py-tvdb_api/pkg-descr b/www/py-tvdb_api/pkg-descr
index 3eec92b3272d..271455c59327 100644
--- a/www/py-tvdb_api/pkg-descr
+++ b/www/py-tvdb_api/pkg-descr
@@ -1,3 +1,3 @@
An easy to use API interface to TheTVDB.com.
-WWW: https://pypi.python.org/pypi/tvdb_api
+WWW: https://pypi.org/project/tvdb_api/
diff --git a/www/py-uliweb/pkg-descr b/www/py-uliweb/pkg-descr
index cf9cdaf087f4..c68e3b85e048 100644
--- a/www/py-uliweb/pkg-descr
+++ b/www/py-uliweb/pkg-descr
@@ -1,3 +1,3 @@
Uliweb is a Python based web framework.
-WWW: https://pypi.python.org/pypi/Uliweb
+WWW: https://pypi.org/project/Uliweb/
diff --git a/www/py-user_agent/pkg-descr b/www/py-user_agent/pkg-descr
index 4ac5e2af28ef..f579ca15e3b0 100644
--- a/www/py-user_agent/pkg-descr
+++ b/www/py-user_agent/pkg-descr
@@ -1,4 +1,4 @@
This module is for generating random, valid web navigator's configs
& User-Agent HTTP headers.
-WWW: https://pypi.python.org/pypi/user_agent
+WWW: https://pypi.org/project/user_agent/
diff --git a/www/py-waitress/pkg-descr b/www/py-waitress/pkg-descr
index ff86718232ef..db799f5b94cf 100644
--- a/www/py-waitress/pkg-descr
+++ b/www/py-waitress/pkg-descr
@@ -1,3 +1,3 @@
Waitress, is pure Python WSGI server.
-WWW: https://pypi.python.org/pypi/waitress
+WWW: https://pypi.org/project/waitress/
diff --git a/www/py-wsgiauth/pkg-descr b/www/py-wsgiauth/pkg-descr
index 6fc5ef380164..8c5154f67902 100644
--- a/www/py-wsgiauth/pkg-descr
+++ b/www/py-wsgiauth/pkg-descr
@@ -2,4 +2,4 @@ WSGI authentication middleware that supports HTTP basic
and digest authentication, IP authentication, and form-based or OpenID
authentication using signed cookies or URL query parameters.
-WWW: https://pypi.python.org/pypi/wsgiauth
+WWW: https://pypi.org/project/wsgiauth/
diff --git a/www/py-zope.app.wsgi/pkg-descr b/www/py-zope.app.wsgi/pkg-descr
index a96fe4033e40..ee5e03c49ea8 100644
--- a/www/py-zope.app.wsgi/pkg-descr
+++ b/www/py-zope.app.wsgi/pkg-descr
@@ -1,3 +1,3 @@
WSGI application for the zope.publisher.
-WWW: https://pypi.python.org/pypi/zope.app.wsgi
+WWW: https://pypi.org/project/zope.app.wsgi/
diff --git a/www/uwsgitop/pkg-descr b/www/uwsgitop/pkg-descr
index 7cfeadd69651..aae576824d9e 100644
--- a/www/uwsgitop/pkg-descr
+++ b/www/uwsgitop/pkg-descr
@@ -7,4 +7,4 @@ Then connect uwsgitop to the stats socket
uwsgitop /tmp/stats.socket
-WWW: https://pypi.python.org/pypi/uwsgitop
+WWW: https://pypi.org/project/uwsgitop/
diff --git a/x11-fonts/py-bdflib/pkg-descr b/x11-fonts/py-bdflib/pkg-descr
index 8266d493aa8f..0582ec5e4b8f 100644
--- a/x11-fonts/py-bdflib/pkg-descr
+++ b/x11-fonts/py-bdflib/pkg-descr
@@ -2,4 +2,4 @@ This library allows Python to read, modify, and write out bitmap fonts in
the BDF file format, such as are used as screen fonts in GNOME and KDE
(among others).
-WWW: https://pypi.python.org/pypi/bdflib
+WWW: https://pypi.org/project/bdflib/
diff --git a/x11-toolkits/py-Pmw/pkg-descr b/x11-toolkits/py-Pmw/pkg-descr
index 743303c980d7..662a8b99b8fe 100644
--- a/x11-toolkits/py-Pmw/pkg-descr
+++ b/x11-toolkits/py-Pmw/pkg-descr
@@ -20,4 +20,4 @@ making it more readable and maintainable and more easily modifiable.
The ability to extend Pmw megawidgets enables developers to create new
megawidgets based on previous work.
-WWW: https://pypi.python.org/pypi/Pmw
+WWW: https://pypi.org/project/Pmw/
diff --git a/x11-toolkits/py-SquareMap/pkg-descr b/x11-toolkits/py-SquareMap/pkg-descr
index 443a5d040657..cf3a5660ce55 100644
--- a/x11-toolkits/py-SquareMap/pkg-descr
+++ b/x11-toolkits/py-SquareMap/pkg-descr
@@ -1,4 +1,4 @@
Hierarchic data visualization control intended for use with structures where
"parents" hold collections of weighted children.
-WWW: https://pypi.python.org/pypi/SquareMap
+WWW: https://pypi.org/project/SquareMap/
diff --git a/x11-toolkits/py-kiwi-gtk/pkg-descr b/x11-toolkits/py-kiwi-gtk/pkg-descr
index 3a9c44544b9e..c0498f5f3978 100644
--- a/x11-toolkits/py-kiwi-gtk/pkg-descr
+++ b/x11-toolkits/py-kiwi-gtk/pkg-descr
@@ -2,4 +2,4 @@ kiwi offers a set of enhanced widgets for Python based on PyGTK.
It also includes a framework designed to make creating Python
applications using PyGTK and libglade much simpler.
-WWW: https://pypi.python.org/pypi/kiwi-gtk
+WWW: https://pypi.org/project/kiwi-gtk/
diff --git a/x11/py-xdot/pkg-descr b/x11/py-xdot/pkg-descr
index d6f6dc028ddc..7def102f04df 100644
--- a/x11/py-xdot/pkg-descr
+++ b/x11/py-xdot/pkg-descr
@@ -4,4 +4,4 @@ intermediate format, and PyGTK and Cairo for rendering.
xdot.py can be used either as a standalone application from command
line, or as a library embedded in your python application.
-WWW: https://pypi.python.org/pypi/xdot
+WWW: https://pypi.org/project/xdot/
diff --git a/x11/py-xdot06/pkg-descr b/x11/py-xdot06/pkg-descr
index d6f6dc028ddc..7def102f04df 100644
--- a/x11/py-xdot06/pkg-descr
+++ b/x11/py-xdot06/pkg-descr
@@ -4,4 +4,4 @@ intermediate format, and PyGTK and Cairo for rendering.
xdot.py can be used either as a standalone application from command
line, or as a library embedded in your python application.
-WWW: https://pypi.python.org/pypi/xdot
+WWW: https://pypi.org/project/xdot/