Re: [PR PATCH] [Updated] offlineimap: update to 8.0.0; remove dispensable py2 deps

[icp1994 <icp1994@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1003 bytes --]

There is an updated pull request by icp1994 against master on the void-packages repository

https://github.com/icp1994/void-packages offlineimap
https://github.com/void-linux/void-packages/pull/38781

offlineimap: update to 8.0.0; remove dispensable py2 deps
#### Testing the changes
- I tested the changes in this PR: **NO**

#### Local build testing
- I built this PR locally for my native architecture, x86_64

This update migrates the package to python 3. Two of the python 2 dependencies under the old full-deptree don't have any more dependent packages. I removed one of them outright. For the other, which provided a python 3 counterpart as subpackage, removed the python 2 package and converted the python 3 symlinked package to be its own module.

I **DID NOT** do any significant runtime testing on the updated `offlineimap` package expect for installing and running `--version`, `--help` etc.

A patch file from https://github.com/void-linux/void-packages/pull/38781.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-offlineimap-38781.patch --]
[-- Type: text/x-diff, Size: 8122 bytes --]

From cce8a2d80b4170d8fa71fb53a555d1265cd3c8d2 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 19 Aug 2022 16:09:20 +0530
Subject: [PATCH 1/5] python-selectors2: remove package

Inessential python2 remnant
---
 srcpkgs/python-selectors2/template | 17 -----------------
 srcpkgs/removed-packages/template  |  1 +
 2 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 srcpkgs/python-selectors2/template

diff --git a/srcpkgs/python-selectors2/template b/srcpkgs/python-selectors2/template
deleted file mode 100644
index 8b4191943bdd..000000000000
--- a/srcpkgs/python-selectors2/template
+++ /dev/null
@@ -1,17 +0,0 @@
-# Template file for 'python-selectors2'
-pkgname=python-selectors2
-version=2.0.2
-revision=2
-wrksrc="selectors2-${version}"
-build_style=python2-module
-hostmakedepends="python-setuptools"
-short_desc="Drop-in replacement of the selectors module for Python 2.6+"
-maintainer="pulux <pulux@pf4sh.de>"
-license="MIT"
-homepage="https://github.com/SethMichaelLarson/selectors2"
-distfiles="${PYPI_SITE}/s/selectors2/selectors2-${version}.tar.gz"
-checksum=1f1bbaac203a23fbc851dc1b5a6e92c50698cc8cefa5873eb5b89eef53d1d82b
-
-post_install() {
-	vlicense LICENSE
-}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 272d240a429d..f1946eb516eb 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -334,6 +334,7 @@ replaces="
  python-rdflib<=4.2.2_6
  python-reportlab<=3.5.42_3
  python-requests<=2.26.0_2
+ python-selectors2<=2.0.2_2
  python-spambayes<=1.1b3_3
  python-sqlite<=2.8.3_1
  python-unicorn>=0

From 830cc522cc35ea7e5ba7e659a46e99d80ba6484b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 19 Aug 2022 16:01:39 +0530
Subject: [PATCH 2/5] python-rfc6555: remove package

Inessential python2 remnant
---
 srcpkgs/python-rfc6555/template   | 23 -----------------------
 srcpkgs/python3-rfc6555           |  1 -
 srcpkgs/removed-packages/template |  1 +
 3 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 srcpkgs/python-rfc6555/template
 delete mode 120000 srcpkgs/python3-rfc6555

diff --git a/srcpkgs/python-rfc6555/template b/srcpkgs/python-rfc6555/template
deleted file mode 100644
index c55e56a71b76..000000000000
--- a/srcpkgs/python-rfc6555/template
+++ /dev/null
@@ -1,23 +0,0 @@
-# Template file for 'python-rfc6555'
-pkgname=python-rfc6555
-version=0.0.0
-revision=5
-wrksrc="rfc6555-${version}"
-build_style=python-module
-pycompile_module="rfc6555"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-selectors2"
-short_desc="Python2 implementation of the Happy Eyeballs Algorithm"
-maintainer="Peter Bui <pbui@github.bx612.space>"
-license="Apache-2.0"
-homepage="https://github.com/sethmlarson/rfc6555"
-distfiles="${PYPI_SITE}/r/rfc6555/rfc6555-${version}.tar.gz"
-checksum=191cbba0315b53654155321e56a93466f42cd0a474b4f341df4d03264dcb5217
-
-python3-rfc6555_package() {
-	pycompile_module="rfc6555"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/lib/python3*
-	}
-}
diff --git a/srcpkgs/python3-rfc6555 b/srcpkgs/python3-rfc6555
deleted file mode 120000
index 7275c04c1a46..000000000000
--- a/srcpkgs/python3-rfc6555
+++ /dev/null
@@ -1 +0,0 @@
-python-rfc6555
\ No newline at end of file
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index f1946eb516eb..8e39c3c1db9f 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -334,6 +334,7 @@ replaces="
  python-rdflib<=4.2.2_6
  python-reportlab<=3.5.42_3
  python-requests<=2.26.0_2
+ python-rfc6555<=0.0.0_5
  python-selectors2<=2.0.2_2
  python-spambayes<=1.1b3_3
  python-sqlite<=2.8.3_1

From bdb4e97c1308b39f9ea9bec720c0ebb3d612acb9 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 19 Aug 2022 16:11:40 +0530
Subject: [PATCH 3/5] python3-rfc6555: decouple from python-rfc6555, update to
 0.1.0.

---
 srcpkgs/python3-rfc6555/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-rfc6555/template

diff --git a/srcpkgs/python3-rfc6555/template b/srcpkgs/python3-rfc6555/template
new file mode 100644
index 000000000000..b195c55b676d
--- /dev/null
+++ b/srcpkgs/python3-rfc6555/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-rfc6555'
+pkgname=python3-rfc6555
+version=0.1.0
+revision=1
+wrksrc=rfc6555-${version}
+build_style=python3-module
+make_check_args="--deselect tests/test_ipv6.py::test_ipv6_available" # CI fail
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-pytest-xdist"
+short_desc="Python implementation of Happy Eyeballs Algorithm described in RFC 6555"
+maintainer="icp <pangolin@vivaldi.net>"
+license="Apache-2.0"
+homepage="https://github.com/sethmlarson/rfc6555"
+changelog="https://raw.githubusercontent.com/sethmlarson/rfc6555/main/CHANGES.rst"
+distfiles="https://github.com/sethmlarson/rfc6555/archive/refs/tags/v${version}.tar.gz"
+checksum=8a15da0f619227c6938be27c64e844668701bca65205002eda789a4fd883b23f

From 783ee8ce5aced35b61dbbde01b16b1a89cc1847d Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 19 Aug 2022 16:12:33 +0530
Subject: [PATCH 4/5] New package: python3-imaplib2-3.6

---
 srcpkgs/python3-imaplib2/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-imaplib2/template

diff --git a/srcpkgs/python3-imaplib2/template b/srcpkgs/python3-imaplib2/template
new file mode 100644
index 000000000000..7c7d7f4fe330
--- /dev/null
+++ b/srcpkgs/python3-imaplib2/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-imaplib2'
+pkgname=python3-imaplib2
+version=3.6
+revision=1
+wrksrc=imaplib2-${version}
+build_style=python3-pep517
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3"
+checkdepends="python3-pytest-xdist"
+short_desc="Threaded Python IMAP4 client"
+maintainer="icp <pangolin@vivaldi.net>"
+license="MIT"
+homepage="https://github.com/jazzband/imaplib2"
+distfiles="https://github.com/jazzband/imaplib2/archive/refs/tags/v${version}.tar.gz"
+checksum=b55c434ecfb26a057d6bb3c8da0d674c83dd702674bb898c418a075a60560e42
+
+post_install() {
+	vlicense LICENCE
+}

From fd95523cb28ccffb1cd5d377babf06ad76c0150f Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 19 Aug 2022 16:13:27 +0530
Subject: [PATCH 5/5] offlineimap: update to 8.0.0.

---
 srcpkgs/offlineimap/template | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/offlineimap/template b/srcpkgs/offlineimap/template
index 481ffdb97779..ea68ab99738d 100644
--- a/srcpkgs/offlineimap/template
+++ b/srcpkgs/offlineimap/template
@@ -1,17 +1,22 @@
 # Template file for 'offlineimap'
 pkgname=offlineimap
-version=7.3.3
-revision=2
-build_style=python2-module
-hostmakedepends="python-six python-rfc6555 asciidoc"
-depends="python-six python-rfc6555"
+version=8.0.0
+revision=1
+wrksrc="offlineimap3-${version}"
+build_style=python3-module
+make_check_args="--ignore test/tests/test_00_imaputil.py
+ --ignore test/tests/test_01_basic.py --ignore test/tests/test_02_MappedIMAP.py"
+_deps="python3-distro python3-rfc6555 python3-imaplib2"
+hostmakedepends="${_deps} python3-setuptools asciidoc"
+depends="${_deps}"
+checkdepends="${depends} python3-pytest-xdist"
 short_desc="Powerful IMAP/Maildir synchronization and reader support"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://offlineimap.org/"
-changelog="https://raw.githubusercontent.com/OfflineIMAP/offlineimap/master/Changelog.md"
-distfiles="https://github.com/OfflineIMAP/offlineimap/archive/v${version}.tar.gz"
-checksum=bf1a777e63d2174eef0fe864ea577d843515b64d4f3a8630ad2d1b34a4afcaa6
+changelog="https://raw.githubusercontent.com/OfflineIMAP/offlineimap3/master/Changelog.md"
+distfiles="https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/v${version}.tar.gz"
+checksum=5d40c163ca2fbf89658116e29f8fa75050d0c34c29619019eee1a84c90fcab32
 
 post_install() {
 	make -C docs man