git: fb1b928c06f8 - main - www/py-weboob: Rename to www/py-woob
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 24 Feb 2022 14:29:22 UTC
The branch main has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=fb1b928c06f8d4ae7de24b57c0c826f1c75f160b
commit fb1b928c06f8d4ae7de24b57c0c826f1c75f160b
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2022-02-24 13:39:59 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2022-02-24 14:27:26 +0000
www/py-weboob: Rename to www/py-woob
Project was renamed from weboob to woob.
Update to 3.0.
www/py-weboob-qt: Rename to www/py-woob-qt
Project was renamed from weboob-qt to woob-qt.
Update to latest commit. Upstream did not create a tag in git after
the project was renamed, so a new release was never made. But we
need these changes so it is compatible with base woob. This is
technically version 3.0.
---
MOVED | 2 ++
www/Makefile | 4 ++--
www/py-weboob-qt/distinfo | 3 ---
www/py-weboob-qt/files/patch-setup.cfg | 19 -------------------
www/py-weboob/distinfo | 3 ---
www/{py-weboob-qt => py-woob-qt}/Makefile | 30 ++++++++++++++++--------------
www/py-woob-qt/distinfo | 3 +++
www/{py-weboob => py-woob-qt}/pkg-descr | 4 ++--
www/{py-weboob => py-woob}/Makefile | 9 ++++-----
www/py-woob/distinfo | 3 +++
www/{py-weboob-qt => py-woob}/pkg-descr | 4 ++--
11 files changed, 34 insertions(+), 50 deletions(-)
diff --git a/MOVED b/MOVED
index 1fb422730b68..67c1815fa84b 100644
--- a/MOVED
+++ b/MOVED
@@ -16895,3 +16895,5 @@ graphics/copperspice|x11-toolkits/copperspice|2022-02-20|Revive in more appropri
math/mathics-django||2022-02-20|Mathics-Django now requires npm: you can use math/mathicsscript instead
net-mgmt/percona-monitoring-plugins||2022-02-22|Has expired: Upstream EOL reached on 2020-08-01
math/coinmumps|math/coin-or-mumps|2022-02-23|Renamed into a more appropriate name
+www/py-weboob|www/py-woob|2022-02-24|Project renamed
+www/py-weboob-qt|www/py-woob-qt|2022-02-24|Project renamed
diff --git a/www/Makefile b/www/Makefile
index a3a07492dec1..d0aed03de59d 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1790,8 +1790,6 @@
SUBDIR += py-webargs
SUBDIR += py-webassets
SUBDIR += py-webob
- SUBDIR += py-weboob
- SUBDIR += py-weboob-qt
SUBDIR += py-websocket-client
SUBDIR += py-webunit
SUBDIR += py-werkzeug
@@ -1799,6 +1797,8 @@
SUBDIR += py-whitenoise
SUBDIR += py-wikipedia
SUBDIR += py-wikitools
+ SUBDIR += py-woob
+ SUBDIR += py-woob-qt
SUBDIR += py-ws4py
SUBDIR += py-wsaccel
SUBDIR += py-wsgidav
diff --git a/www/py-weboob-qt/distinfo b/www/py-weboob-qt/distinfo
deleted file mode 100644
index d3c937d042c3..000000000000
--- a/www/py-weboob-qt/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1593412735
-SHA256 (weboob-qt-2.0.tar.gz) = a894c0e685317210c472058c6533a6e02e4d5c1e77c2ec0888e671fb98b99fd0
-SIZE (weboob-qt-2.0.tar.gz) = 900778
diff --git a/www/py-weboob-qt/files/patch-setup.cfg b/www/py-weboob-qt/files/patch-setup.cfg
deleted file mode 100644
index 01318011dbe1..000000000000
--- a/www/py-weboob-qt/files/patch-setup.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-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 =
diff --git a/www/py-weboob/distinfo b/www/py-weboob/distinfo
deleted file mode 100644
index 6b22c60b6923..000000000000
--- a/www/py-weboob/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1593411484
-SHA256 (weboob-2.0.tar.gz) = fc8be1f77ad3a53285cef8b20a8b747960c163fad729c56838043d8ddcdfc9b0
-SIZE (weboob-2.0.tar.gz) = 1014657
diff --git a/www/py-weboob-qt/Makefile b/www/py-woob-qt/Makefile
similarity index 60%
rename from www/py-weboob-qt/Makefile
rename to www/py-woob-qt/Makefile
index 44634070ce1c..4c1551dad544 100644
--- a/www/py-weboob-qt/Makefile
+++ b/www/py-woob-qt/Makefile
@@ -1,8 +1,7 @@
-PORTNAME= weboob-qt
-PORTVERSION= 2.0
-PORTREVISION= 2
+PORTNAME= woob-qt
+DISTVERSION= 2.0-24
+DISTVERSIONSUFFIX= -g5f92f73
CATEGORIES= www python
-MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= jhale@FreeBSD.org
@@ -11,13 +10,17 @@ COMMENT= Web Outside of Browsers
LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/COPYING.LESSER
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}weboob>=2.0:www/py-weboob@${PY_FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}weboob>=2.0:www/py-weboob@${PY_FLAVOR}
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}woob>=2.0:www/py-woob@${PY_FLAVOR}
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}woob>=2.0:www/py-woob@${PY_FLAVOR}
-USES= gmake pyqt:5 python:3.6+
+USES= gmake pyqt:5 python:3.7+
USE_PYQT= pyqt5 sip
USE_PYTHON= autoplist distutils
+USE_GITLAB= yes
+GL_ACCOUNT= woob
+GL_COMMIT= 5f92f73ed91b215bfd1c77d65650157335691b8b
+
BINARY_ALIAS= pyuic5-python${PYTHON_VER}=pyuic5-${PYTHON_VER}
NO_ARCH= yes
@@ -25,17 +28,16 @@ NO_ARCH= yes
PYDISTUTILS_BUILDARGS= ${CONFIGURE_ARGS}
PYDISTUTILS_INSTALLARGS=-c -O1 --prefix=${PREFIX} ${CONFIGURE_ARGS}
-# weboob-qt attempts to install __init__.py and the generated bytecode into
-# these directories which conflicts with those installed by weboob. We need to
+# woob-qt attempts to install __init__.py and the generated bytecode into
+# these directories which conflicts with those installed by woob. 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
+COMMON_DIRS= woob \
+ woob/applications \
+ woob/tools \
+ woob/tools/application
post-patch:
@${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py
- @(cd ${WRKSRC}/man && ${FIND} . -type f ! -name 'q*' -and ! -name '*qt.1' -delete)
post-install:
.for dir in ${COMMON_DIRS:S|/|\/|g}
diff --git a/www/py-woob-qt/distinfo b/www/py-woob-qt/distinfo
new file mode 100644
index 000000000000..cf562904b34c
--- /dev/null
+++ b/www/py-woob-qt/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1645628579
+SHA256 (woob-woob-qt-5f92f73ed91b215bfd1c77d65650157335691b8b_GL0.tar.gz) = e54ffbe1dc6ca319d28d6231b6d3fd82d284f3c7741cea1b044294500a5e8d7d
+SIZE (woob-woob-qt-5f92f73ed91b215bfd1c77d65650157335691b8b_GL0.tar.gz) = 374457
diff --git a/www/py-weboob/pkg-descr b/www/py-woob-qt/pkg-descr
similarity index 56%
rename from www/py-weboob/pkg-descr
rename to www/py-woob-qt/pkg-descr
index 6ca2c9e9c9c3..ff871d884e62 100644
--- a/www/py-weboob/pkg-descr
+++ b/www/py-woob-qt/pkg-descr
@@ -1,5 +1,5 @@
-Weboob is a collection of applications able to interact with websites,
+Woob is a collection of applications able to interact with websites,
without requiring the user to open them in a browser. It also
provides well-defined APIs to talk to websites lacking one.
-WWW: http://weboob.org
+WWW: https://woob.tech/
diff --git a/www/py-weboob/Makefile b/www/py-woob/Makefile
similarity index 93%
rename from www/py-weboob/Makefile
rename to www/py-woob/Makefile
index e7a0a4d5e65c..48f356b2ad93 100644
--- a/www/py-weboob/Makefile
+++ b/www/py-woob/Makefile
@@ -1,5 +1,5 @@
-PORTNAME= weboob
-PORTVERSION= 2.0
+PORTNAME= woob
+PORTVERSION= 3.0
CATEGORIES= www python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -27,7 +27,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \
wget:ftp/wget \
gpg2:security/gnupg
-USES= python:3.6+
+USES= python:3.7+
USE_PYTHON= autoplist distutils
NO_ARCH= yes
@@ -48,7 +48,6 @@ 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 && ${RM} q*.1 weboob-config-qt.1)
+ @${REINPLACE_CMD} -e 's|/etc/ssl/certs|${LOCALBASE}/etc/ssl|g' ${WRKSRC}/woob/browser/nss.py
.include <bsd.port.mk>
diff --git a/www/py-woob/distinfo b/www/py-woob/distinfo
new file mode 100644
index 000000000000..ee1062064620
--- /dev/null
+++ b/www/py-woob/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1645626875
+SHA256 (woob-3.0.tar.gz) = 47864df4906b44a659abe59630c0e28a1aa24ffbc3c90e22454b58f88bef1726
+SIZE (woob-3.0.tar.gz) = 1037459
diff --git a/www/py-weboob-qt/pkg-descr b/www/py-woob/pkg-descr
similarity index 56%
rename from www/py-weboob-qt/pkg-descr
rename to www/py-woob/pkg-descr
index 6ca2c9e9c9c3..ff871d884e62 100644
--- a/www/py-weboob-qt/pkg-descr
+++ b/www/py-woob/pkg-descr
@@ -1,5 +1,5 @@
-Weboob is a collection of applications able to interact with websites,
+Woob is a collection of applications able to interact with websites,
without requiring the user to open them in a browser. It also
provides well-defined APIs to talk to websites lacking one.
-WWW: http://weboob.org
+WWW: https://woob.tech/