commit: e0a53e05bdc10fadc1b3f13de7170d4692b373cd Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon May 26 14:03:09 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon May 26 14:15:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a53e05
dev-python/wxpython: drop sip-6.11 upper bound Unfortunately needs a revbump to clear up VDB of the upper bound and let portage update sip with default --with-bdeps=y. Albeit likely not many users had time to build with it. fwiw only do it for latest, in process of stabilization and no sense in making stable 4.2.2 users rebuild before an update. Also block 6.11.1-r0 in latest for now to ensure it's updated, but the jarring || ( ( > < ) > ) won't need to be kept long term nor need a revbump if it's revmoed. Bug: https://bugs.gentoo.org/956566 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-python/wxpython/wxpython-4.2.0.ebuild | 2 -- dev-python/wxpython/wxpython-4.2.1-r2.ebuild | 2 -- dev-python/wxpython/wxpython-4.2.2.ebuild | 2 -- .../{wxpython-4.2.3-r1.ebuild => wxpython-4.2.3-r2.ebuild} | 12 +++++++++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-python/wxpython/wxpython-4.2.0.ebuild b/dev-python/wxpython/wxpython-4.2.0.ebuild index 878f2b87596e..b320d237f144 100644 --- a/dev-python/wxpython/wxpython-4.2.0.ebuild +++ b/dev-python/wxpython/wxpython-4.2.0.ebuild @@ -32,13 +32,11 @@ RDEPEND=" media-libs/libjpeg-turbo:= " DEPEND="${RDEPEND}" -# <sip-6.11 dep: bug #956566 BDEPEND=" app-text/doxygen dev-python/cython[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/sip-6.6.2[${PYTHON_USEDEP}] - <dev-python/sip-6.11.1[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] test? ( ${VIRTUALX_DEPEND} diff --git a/dev-python/wxpython/wxpython-4.2.1-r2.ebuild b/dev-python/wxpython/wxpython-4.2.1-r2.ebuild index be2499a79b4a..9636fc271872 100644 --- a/dev-python/wxpython/wxpython-4.2.1-r2.ebuild +++ b/dev-python/wxpython/wxpython-4.2.1-r2.ebuild @@ -37,13 +37,11 @@ DEPEND=" RDEPEND=" ${DEPEND} " -# <sip-6.11 dep: bug #956566 BDEPEND=" app-text/doxygen dev-python/cython[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/sip-6.6.2[${PYTHON_USEDEP}] - <dev-python/sip-6.11.1[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] test? ( ${VIRTUALX_DEPEND} diff --git a/dev-python/wxpython/wxpython-4.2.2.ebuild b/dev-python/wxpython/wxpython-4.2.2.ebuild index 17bf6c5b1a62..51d28a550bdd 100644 --- a/dev-python/wxpython/wxpython-4.2.2.ebuild +++ b/dev-python/wxpython/wxpython-4.2.2.ebuild @@ -36,13 +36,11 @@ DEPEND=" RDEPEND=" ${DEPEND} " -# <sip-6.11 dep: bug #956566 BDEPEND=" app-text/doxygen dev-python/cython[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/sip-6.8.5[${PYTHON_USEDEP}] - <dev-python/sip-6.11.1[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] test? ( ${VIRTUALX_DEPEND} diff --git a/dev-python/wxpython/wxpython-4.2.3-r1.ebuild b/dev-python/wxpython/wxpython-4.2.3-r2.ebuild similarity index 93% rename from dev-python/wxpython/wxpython-4.2.3-r1.ebuild rename to dev-python/wxpython/wxpython-4.2.3-r2.ebuild index 23a4e024a1ca..313e3063f78d 100644 --- a/dev-python/wxpython/wxpython-4.2.3-r1.ebuild +++ b/dev-python/wxpython/wxpython-4.2.3-r2.ebuild @@ -36,12 +36,18 @@ DEPEND=" RDEPEND=" ${DEPEND} " -# <sip-6.11 dep: bug #956566 +# sip-6.11.0-r0 blocked wrt bug #956566, can replace by just >=6.8.5 +# on bump or so as the version was short lived and never stable BDEPEND=" app-text/doxygen dev-python/cython[${PYTHON_USEDEP}] - >=dev-python/sip-6.8.5[${PYTHON_USEDEP}] - <dev-python/sip-6.11.1[${PYTHON_USEDEP}] + || ( + ( + >=dev-python/sip-6.8.5[${PYTHON_USEDEP}] + <dev-python/sip-6.11.1-r0[${PYTHON_USEDEP}] + ) + >=dev-python/sip-6.11.1-r1[${PYTHON_USEDEP}] + ) test? ( ${VIRTUALX_DEPEND} dev-python/appdirs[${PYTHON_USEDEP}]
