diff --git a/calibre/Makefile b/calibre/Makefile index ffb9bef872..e18c69c55e 100644 --- a/calibre/Makefile +++ b/calibre/Makefile @@ -20,7 +20,7 @@ DEPENDS+= ${PYPKGPREFIX}-css-parser-[0-9]*:../../textproc/py-css-parser DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil DEPENDS+= ${PYPKGPREFIX}-dns>=1.6.0:../../net/py-dns DEPENDS+= ${PYPKGPREFIX}-elementtree-[0-9]*:../../textproc/py-elementtree -DEPENDS+= ${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser +DEPENDS+= ${PYPKGPREFIX}-feedparser<6.0.0:../../textproc/py-feedparser5 DEPENDS+= ${PYPKGPREFIX}-html2text-[0-9]*:../../textproc/py-html2text-2019.8.11 DEPENDS+= ${PYPKGPREFIX}-html5-parser-[0-9]*:../../textproc/py-html5-parser DEPENDS+= ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown diff --git a/canto-daemon/Makefile b/canto-daemon/Makefile index 40af04b2ec..64bc41dd22 100644 --- a/canto-daemon/Makefile +++ b/canto-daemon/Makefile @@ -15,7 +15,7 @@ LICENSE= gnu-gpl-v2 WRKSRC= ${WRKDIR}/canto-next-0.9.7 USE_LANGUAGES= # none -DEPENDS+= ${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser +DEPENDS+= ${PYPKGPREFIX}-feedparser<6.0.0:../../textproc/py-feedparser5 PYTHON_VERSIONS_INCOMPATIBLE= 27 PYDISTUTILSPKG= YES diff --git a/gitsome/Makefile b/gitsome/Makefile index a1c792f08b..635dde389e 100644 --- a/gitsome/Makefile +++ b/gitsome/Makefile @@ -12,7 +12,7 @@ LICENSE= apache-2.0 DEPENDS+= ${PYPKGPREFIX}-click>=5.1:../../devel/py-click DEPENDS+= ${PYPKGPREFIX}-colorama>=0.3.3:../../comms/py-colorama DEPENDS+= ${PYPKGPREFIX}-docopt>=0.6.2:../../devel/py-docopt -DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.2.1:../../textproc/py-feedparser +DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.2.1<6.0.0:../../textproc/py-feedparser5 DEPENDS+= ${PYPKGPREFIX}-numpydoc>=0.5:../../textproc/py-numpydoc DEPENDS+= ${PYPKGPREFIX}-ply>=3.4:../../devel/py-ply DEPENDS+= ${PYPKGPREFIX}-prompt_toolkit>=2.0.0:../../devel/py-prompt_toolkit2 diff --git a/py-arxiv/Makefile b/py-arxiv/Makefile index e53f594757..d425b839fc 100644 --- a/py-arxiv/Makefile +++ b/py-arxiv/Makefile @@ -10,7 +10,7 @@ HOMEPAGE= https://github.com/lukasschwab/arxiv.py COMMENT= Python wrapper for the arXiv API LICENSE= mit -DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.2.1:../../textproc/py-feedparser +DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.2.1<6.0.0:../../textproc/py-feedparser5 DEPENDS+= ${PYPKGPREFIX}-requests>=2.24.0:../../devel/py-requests TEST_DEPENDS+= # TODO: pytest>=0 diff --git a/py-booktype/Makefile b/py-booktype/Makefile index 9cd4398874..3ffbaf90ff 100644 --- a/py-booktype/Makefile +++ b/py-booktype/Makefile @@ -15,7 +15,7 @@ DEPENDS+= p5-Text-Aspell>=0.09:../../textproc/p5-Text-Aspell DEPENDS+= p5-XML-DOM>=1.44:../../textproc/p5-XML-DOM DEPENDS+= ${PYPKGPREFIX}-simplejson>=2.6.0:../../converters/py-simplejson -DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.1.2:../../textproc/py-feedparser +DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.1.2<6.0.0:../../textproc/py-feedparser5 DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml DEPENDS+= ${PYPKGPREFIX}-Unidecode>=0.04.9:../../textproc/py-Unidecode DEPENDS+= ${PYPKGPREFIX}-django-[0-9]*:../../www/py-django diff --git a/py-octoprint/Makefile b/py-octoprint/Makefile index a47779bbf0..b546cddcb7 100644 --- a/py-octoprint/Makefile +++ b/py-octoprint/Makefile @@ -19,7 +19,7 @@ DEPENDS+= ${PYPKGPREFIX}-awesome-slugify>=1.6.5:../../wip/py-awesome-slugify DEPENDS+= ${PYPKGPREFIX}-cachelib>=0.1:../../wip/py-cachelib DEPENDS+= ${PYPKGPREFIX}-chainmap>=1.0.3:../../wip/py-chainmap DEPENDS+= ${PYPKGPREFIX}-emoji>=0.5.1:../../converters/py-emoji -DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.2.1:../../textproc/py-feedparser +DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.2.1<6.0.0:../../textproc/py-feedparser5 DEPENDS+= ${PYPKGPREFIX}-filetype>=1.0.5:../../wip/py-filetype DEPENDS+= ${PYPKGPREFIX}-flask>=0.10.1:../../www/py-flask DEPENDS+= ${PYPKGPREFIX}-flask-assets>=0.12:../../www/py-flask-assets diff --git a/py-weboob/Makefile b/py-weboob/Makefile index 45149e179e..199224c1e0 100644 --- a/py-weboob/Makefile +++ b/py-weboob/Makefile @@ -11,7 +11,7 @@ COMMENT= Weboob, Web Out Of Browsers LICENSE= gnu-agpl-v3 DEPENDS+= ${PYPKGPREFIX}-requests>=2.7.0:../../devel/py-requests -DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.1.3:../../textproc/py-feedparser +DEPENDS+= ${PYPKGPREFIX}-feedparser>=5.1.3<6.0.0:../../textproc/py-feedparser5 DEPENDS+= ${PYPKGPREFIX}-lxml>=3.4.4:../../textproc/py-lxml DEPENDS+= ${PYPKGPREFIX}-ptable>=0.7.2:../../textproc/py-ptable DEPENDS+= ${PYPKGPREFIX}-yaml>=3.11:../../textproc/py-yaml diff --git a/rawdog/Makefile b/rawdog/Makefile index 8ce3fe1ecf..18de4e44bf 100644 --- a/rawdog/Makefile +++ b/rawdog/Makefile @@ -11,7 +11,7 @@ LICENSE= gnu-gpl-v2 USE_LANGUAGES= # none -DEPENDS+= ${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser +DEPENDS+= ${PYPKGPREFIX}-feedparser<6.0.0:../../textproc/py-feedparser5 PYTHON_VERSIONS_ACCEPTED= 27 PYDISTUTILSPKG= YES diff --git a/sabnzbd/options.mk b/sabnzbd/options.mk index 446a5685fa..ff78ae041f 100644 --- a/sabnzbd/options.mk +++ b/sabnzbd/options.mk @@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS= feedparser openssl ### feedparser support ### .if !empty(PKG_OPTIONS:Mfeedparser) -DEPENDS+= ${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser +DEPENDS+= ${PYPKGPREFIX}-feedparser<6.0.0:../../textproc/py-feedparser5 .endif ### diff --git a/sabnzbdplus/options.mk b/sabnzbdplus/options.mk index 8d36ba2861..c56893b2fb 100644 --- a/sabnzbdplus/options.mk +++ b/sabnzbdplus/options.mk @@ -27,7 +27,7 @@ DEPENDS+= unrar-[0-9]*:../../archivers/unrar ### feedparser support ### .if !empty(PKG_OPTIONS:Mfeedparser) -DEPENDS+= ${PYPKGPREFIX}-feedparser-[0-9]*:../../textproc/py-feedparser +DEPENDS+= ${PYPKGPREFIX}-feedparser<6.0.0:../../textproc/py-feedparser5 .endif ###