Date: Mon, 18 Jan 2021 20:56:48 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r561967 - in head: finance/kmymoney www www/py-weboob www/py-weboob-qt www/py-weboob-qt/files Message-ID: <202101182056.10IKumde098680@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Mon Jan 18 20:56:47 2021 New Revision: 561967 URL: https://svnweb.freebsd.org/changeset/ports/561967 Log: www/py-weboob: Update to 2.0 The Qt applications have been split out into a separate project upstream, so the QT5 option has been removed and a new port has been created: www/py-weboob-qt. The MMS option has been removed due to the dependency on the expired port multimedia/mimms. Added: head/www/py-weboob-qt/ - copied from r540754, head/www/py-weboob/ head/www/py-weboob-qt/files/ head/www/py-weboob-qt/files/patch-setup.cfg (contents, props changed) Modified: head/finance/kmymoney/Makefile head/www/Makefile head/www/py-weboob-qt/Makefile head/www/py-weboob-qt/distinfo head/www/py-weboob/Makefile head/www/py-weboob/distinfo Modified: head/finance/kmymoney/Makefile ============================================================================== --- head/finance/kmymoney/Makefile Mon Jan 18 20:52:39 2021 (r561966) +++ head/finance/kmymoney/Makefile Mon Jan 18 20:56:47 2021 (r561967) @@ -2,7 +2,7 @@ PORTNAME= kmymoney PORTVERSION= 5.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= finance kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src @@ -93,8 +93,8 @@ SQLCIPHER_LIB_DEPENDS= libsqlcipher.so:databases/sqlci SQLCIPHER_CMAKE_BOOL= ENABLE_SQLCIPHER WEBOOB_DESC= Online banking via Web Outside Of Browsers -WEBOOB_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}weboob>0:www/py-weboob@${PY_FLAVOR} -WEBOOB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}weboob>0:www/py-weboob@${PY_FLAVOR} +WEBOOB_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}weboob-qt>0:www/py-weboob-qt@${PY_FLAVOR} +WEBOOB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}weboob-qt>0:www/py-weboob-qt@${PY_FLAVOR} WEBOOB_USES= python:3.7+ WEBOOB_USE= qt=concurrent WEBOOB_CMAKE_BOOL= ENABLE_WEBOOB Modified: head/www/Makefile ============================================================================== --- head/www/Makefile Mon Jan 18 20:52:39 2021 (r561966) +++ head/www/Makefile Mon Jan 18 20:56:47 2021 (r561967) @@ -1760,6 +1760,7 @@ SUBDIR += py-webassets SUBDIR += py-webob SUBDIR += py-weboob + SUBDIR += py-weboob-qt SUBDIR += py-websocket-client SUBDIR += py-webunit SUBDIR += py-werkzeug Modified: head/www/py-weboob-qt/Makefile ============================================================================== --- head/www/py-weboob/Makefile Mon Jun 29 06:02:28 2020 (r540754) +++ head/www/py-weboob-qt/Makefile Mon Jan 18 20:56:47 2021 (r561967) @@ -1,8 +1,7 @@ # $FreeBSD$ -PORTNAME= weboob -PORTVERSION= 1.5 -PORTREVISION= 1 +PORTNAME= weboob-qt +PORTVERSION= 2.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,56 +12,40 @@ COMMENT= Web Outside of Browsers LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/COPYING.LESSER -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \ - ${PY_FUTURES} \ - ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ - ${PY_PILLOW} \ - ${PYTHON_PKGNAMEPREFIX}html2text>=3.200:textproc/py-html2text@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cssselect>0:www/py-cssselect@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} -RUN_DEPENDS:= ${BUILD_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}PyExecJS>=0:devel/py-PyExecJS@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}prettytable>0:devel/py-prettytable@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}simplejson>0:devel/py-simplejson@${PY_FLAVOR} \ - wget:ftp/wget \ - gpg2:security/gnupg +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}weboob>=2.0:www/py-weboob@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}weboob>=2.0:www/py-weboob@${PY_FLAVOR} -USES= python:3.5+ +USES= gmake pyqt:5 python:3.6+ +USE_PYQT= core gui multimedia multimediawidgets sip widgets USE_PYTHON= autoplist distutils +BINARY_ALIAS= pyuic5-python${PYTHON_VER}=pyuic5-${PYTHON_VER} + NO_ARCH= yes PYDISTUTILS_BUILDARGS= ${CONFIGURE_ARGS} PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} ${CONFIGURE_ARGS} -OPTIONS_DEFINE= CLICOLOR MMS NSS QT5 RTMPDUMP -OPTIONS_DEFAULT= CLICOLOR NSS QT5 +# weboob-qt attempts to install __init__.py and the generated bytecode into +# these directories which conflicts with those installed by weboob. We need to +# delete these files and their entries in the generated plist post-install. +COMMON_DIRS= weboob \ + weboob/applications \ + weboob/tools \ + weboob/tools/application -CLICOLOR_DESC= Color command line interface -CLICOLOR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR} - -MMS_RUN_DEPENDS= mimms:multimedia/mimms - -NSS_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \ - ${PYTHON_PKGNAMEPREFIX}python-nss>0:security/py-python-nss@${PY_FLAVOR} - -QT5_USES= gmake pyqt:5 -QT5_USE= PYQT=core,gui,multimedia,multimediawidgets,sip,widgets -QT5_BINARY_ALIAS= pyuic5-python${PYTHON_VER}=pyuic5-${PYTHON_VER} -QT5_CONFIGURE_ON= --qt --xdg -QT5_CONFIGURE_OFF= --no-qt --no-xdg - -RTMPDUMP_RUN_DEPENDS= rtmpdump:multimedia/rtmpdump - post-patch: @${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py - @${REINPLACE_CMD} -e 's|/etc/ssl/certs|${LOCALBASE}/etc/ssl|g' ${WRKSRC}/weboob/browser/nss.py + @(cd ${WRKSRC}/man && ${FIND} . -type f ! -name 'q*' -and ! -name '*qt.1' -delete) -post-patch-QT5-off: - @(cd ${WRKSRC}/man && ${RM} q*.1 weboob-config-qt.1) +post-install: +.for dir in ${COMMON_DIRS:S|/|\/|g} + @${REINPLACE_CMD} -e '/.*\/${dir}\/__init__.py/d' \ + -e '/.*\/${dir}\/__pycache__.*/d' \ + ${WRKDIR}/.PLIST.pymodtmp +.endfor +.for dir in ${COMMON_DIRS} + @(cd ${STAGEDIR}${PYTHON_SITELIBDIR}/${dir} && ${RM} -r __pycache__ __init__.py) +.endfor .include <bsd.port.mk> Modified: head/www/py-weboob-qt/distinfo ============================================================================== --- head/www/py-weboob/distinfo Mon Jun 29 06:02:28 2020 (r540754) +++ head/www/py-weboob-qt/distinfo Mon Jan 18 20:56:47 2021 (r561967) @@ -1,3 +1,3 @@ -TIMESTAMP = 1553835883 -SHA256 (weboob-1.5.tar.gz) = 7ac1851281a127182f8e8630853c8ab2e635a534928b35150b75d5d0e24b3fb1 -SIZE (weboob-1.5.tar.gz) = 1084274 +TIMESTAMP = 1593412735 +SHA256 (weboob-qt-2.0.tar.gz) = a894c0e685317210c472058c6533a6e02e4d5c1e77c2ec0888e671fb98b99fd0 +SIZE (weboob-qt-2.0.tar.gz) = 900778 Added: head/www/py-weboob-qt/files/patch-setup.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-weboob-qt/files/patch-setup.cfg Mon Jan 18 20:56:47 2021 (r561967) @@ -0,0 +1,19 @@ +For some reason when the check for PyQt5 is present, the applications fail to +start with the error below. Before the Qt applications were split out, it was +noted in the weboob setup.py that the check does not work properly [1]. Not +sure why it was reintroduced after the split. + +[1] https://git.weboob.org/weboob/weboob/blob/83e59081a4d30194d4d3eeb87c73a2067b7070c4/setup.py#L182 + +pkg_resources.DistributionNotFound: The 'PyQt5' distribution was not found and is required by weboob-qt + +--- setup.cfg.orig 2021-01-01 05:18:36 UTC ++++ setup.cfg +@@ -75,7 +75,6 @@ classifiers = + python_requires = >= 3.5 + install_requires = + weboob +- PyQt5 + + [options.entry_points] + gui_scripts = Modified: head/www/py-weboob/Makefile ============================================================================== --- head/www/py-weboob/Makefile Mon Jan 18 20:52:39 2021 (r561966) +++ head/www/py-weboob/Makefile Mon Jan 18 20:56:47 2021 (r561967) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= weboob -PORTVERSION= 1.5 -PORTREVISION= 1 +PORTVERSION= 2.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -38,30 +37,20 @@ NO_ARCH= yes PYDISTUTILS_BUILDARGS= ${CONFIGURE_ARGS} PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} ${CONFIGURE_ARGS} -OPTIONS_DEFINE= CLICOLOR MMS NSS QT5 RTMPDUMP -OPTIONS_DEFAULT= CLICOLOR NSS QT5 +OPTIONS_DEFINE= CLICOLOR NSS RTMPDUMP +OPTIONS_DEFAULT= CLICOLOR NSS CLICOLOR_DESC= Color command line interface CLICOLOR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR} -MMS_RUN_DEPENDS= mimms:multimedia/mimms - NSS_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss \ ${PYTHON_PKGNAMEPREFIX}python-nss>0:security/py-python-nss@${PY_FLAVOR} -QT5_USES= gmake pyqt:5 -QT5_USE= PYQT=core,gui,multimedia,multimediawidgets,sip,widgets -QT5_BINARY_ALIAS= pyuic5-python${PYTHON_VER}=pyuic5-${PYTHON_VER} -QT5_CONFIGURE_ON= --qt --xdg -QT5_CONFIGURE_OFF= --no-qt --no-xdg - RTMPDUMP_RUN_DEPENDS= rtmpdump:multimedia/rtmpdump post-patch: @${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py @${REINPLACE_CMD} -e 's|/etc/ssl/certs|${LOCALBASE}/etc/ssl|g' ${WRKSRC}/weboob/browser/nss.py - -post-patch-QT5-off: @(cd ${WRKSRC}/man && ${RM} q*.1 weboob-config-qt.1) .include <bsd.port.mk> Modified: head/www/py-weboob/distinfo ============================================================================== --- head/www/py-weboob/distinfo Mon Jan 18 20:52:39 2021 (r561966) +++ head/www/py-weboob/distinfo Mon Jan 18 20:56:47 2021 (r561967) @@ -1,3 +1,3 @@ -TIMESTAMP = 1553835883 -SHA256 (weboob-1.5.tar.gz) = 7ac1851281a127182f8e8630853c8ab2e635a534928b35150b75d5d0e24b3fb1 -SIZE (weboob-1.5.tar.gz) = 1084274 +TIMESTAMP = 1593411484 +SHA256 (weboob-2.0.tar.gz) = fc8be1f77ad3a53285cef8b20a8b747960c163fad729c56838043d8ddcdfc9b0 +SIZE (weboob-2.0.tar.gz) = 1014657
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101182056.10IKumde098680>