7 files changed, 25 insertions, 15 deletions
diff --git a/dev-python/ansi2html/ansi2html-1.8.0-r2.ebuild b/dev-python/ansi2html/ansi2html-1.8.0-r2.ebuild
index b513b29157c1..a2dc25d97bfa 100644
--- a/dev-python/ansi2html/ansi2html-1.8.0-r2.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.8.0-r2.ebuild
@@ -4,19 +4,23 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 
 DESCRIPTION="Convert text with ANSI color codes to HTML"
-HOMEPAGE="https://pypi.org/project/ansi2html/
-	https://github.com/pycontribs/ansi2html"
+HOMEPAGE="
+	https://pypi.org/project/ansi2html/
+	https://github.com/pycontribs/ansi2html/
+"
 
 LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="amd64 arm ~riscv x86"
 
-RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+RDEPEND="
+	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
index 8a9cad263bff..fb656166c00a 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.18.0-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1 pypi systemd
@@ -32,7 +32,6 @@ BDEPEND="
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/pytest-subtesthack[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/vdirsyncer/vdirsyncer-0.19.2.ebuild b/dev-python/vdirsyncer/vdirsyncer-0.19.2-r1.ebuild
index dcbb0c4450f7..403f4ce056c1 100644
--- a/dev-python/vdirsyncer/vdirsyncer-0.19.2.ebuild
+++ b/dev-python/vdirsyncer/vdirsyncer-0.19.2-r1.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	>=dev-python/aiohttp-3.8.0[${PYTHON_USEDEP}]
 	<dev-python/aiostream-0.5.0[${PYTHON_USEDEP}]
 	>=dev-python/aiostream-0.4.3[${PYTHON_USEDEP}]
+	dev-python/aiohttp-oauthlib[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/media-gfx/imageworsener/imageworsener-1.3.3.ebuild b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
index 336ee113102f..20c6aa5e2429 100644
--- a/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
+++ b/media-gfx/imageworsener/imageworsener-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ MY_P=${PN}-src-${PV}
 MY_PN=imagew
 
 DESCRIPTION="Utility for image scaling and processing"
-HOMEPAGE="http://entropymine.com/imageworsener/"
-SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz"
+HOMEPAGE="https://entropymine.com/imageworsener/"
+SRC_URI="https://entropymine.com/${PN}/${P}.tar.gz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0"
diff --git a/media-gfx/imageworsener/imageworsener-1.3.4.ebuild b/media-gfx/imageworsener/imageworsener-1.3.4.ebuild
index 2520f3a2e199..5b8c844cab7c 100644
--- a/media-gfx/imageworsener/imageworsener-1.3.4.ebuild
+++ b/media-gfx/imageworsener/imageworsener-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,8 +7,8 @@ MY_P=${PN}-src-${PV}
 MY_PN=imagew
 
 DESCRIPTION="Utility for image scaling and processing"
-HOMEPAGE="http://entropymine.com/imageworsener/"
-SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz"
+HOMEPAGE="https://entropymine.com/imageworsener/"
+SRC_URI="https://entropymine.com/${PN}/${P}.tar.gz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0/3"  # because of libimageworsener.so.3.*.*
diff --git a/media-gfx/imageworsener/imageworsener-1.3.5.ebuild b/media-gfx/imageworsener/imageworsener-1.3.5.ebuild
index 123b730a665b..51bff8b3341d 100644
--- a/media-gfx/imageworsener/imageworsener-1.3.5.ebuild
+++ b/media-gfx/imageworsener/imageworsener-1.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,8 +7,8 @@ MY_P=${PN}-src-${PV}
 MY_PN=imagew
 
 DESCRIPTION="Utility for image scaling and processing"
-HOMEPAGE="http://entropymine.com/imageworsener/"
-SRC_URI="http://entropymine.com/${PN}/${P}.tar.gz"
+HOMEPAGE="https://entropymine.com/imageworsener/"
+SRC_URI="https://entropymine.com/${PN}/${P}.tar.gz"
 
 LICENSE="MIT-with-advertising"
 SLOT="0/3"  # because of libimageworsener.so.3.*.*
diff --git a/profiles/package.mask b/profiles/package.mask
index b7899da7fd82..92d40cee48e5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -34,6 +34,12 @@
 #--- END OF EXAMPLES ---
 
 # Michał Górny <mgorny@gentoo.org> (2023-11-05)
+# Discontinued upstream.  Fails tests with modern pytest.
+# No revdeps left.
+# Removal on 2023-12-05.  Bug #906834.
+dev-python/pytest-subtesthack
+
+# Michał Górny <mgorny@gentoo.org> (2023-11-05)
 # Discontinued in favor of built-in support in setuptools-scm-7.
 # No revdeps left.
 # Removal on 2023-12-05.  Bug #916904.