From ca5fbc6b9bbba5003c69f558975d1384ddb8f9c4 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 29 May 2023 15:21:09 +0100 Subject: [PATCH 01/11] gui-wm/hyprland: tweak HOMEPAGE Signed-off-by: Sam James --- gui-wm/hyprland/hyprland-0.25.0.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gui-wm/hyprland/hyprland-0.25.0.ebuild b/gui-wm/hyprland/hyprland-0.25.0.ebuild index 923882538f0e5..bf62573979c13 100644 --- a/gui-wm/hyprland/hyprland-0.25.0.ebuild +++ b/gui-wm/hyprland/hyprland-0.25.0.ebuild @@ -6,8 +6,7 @@ EAPI=8 inherit meson toolchain-funcs DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks" -HOMEPAGE="https://github.com/hyprwm/Hyprland/releases" - +HOMEPAGE="https://github.com/hyprwm/Hyprland" SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${PF}.gh.tar.gz" S="${WORKDIR}/${PN}-source" From 7f1aea9f24c97debca63c15ca41aa29519eeb07c Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 29 May 2023 15:22:34 +0100 Subject: [PATCH 02/11] dev-lang/mujs: Stabilize 1.3.3 arm, #907264 Signed-off-by: Sam James --- dev-lang/mujs/mujs-1.3.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/mujs/mujs-1.3.3.ebuild b/dev-lang/mujs/mujs-1.3.3.ebuild index 6c8aa130e5268..1984d68dbaf12 100644 --- a/dev-lang/mujs/mujs-1.3.3.ebuild +++ b/dev-lang/mujs/mujs-1.3.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.gz" LICENSE="ISC" # The subslot matches the SONAME SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos" RDEPEND="sys-libs/readline:=" DEPEND="${RDEPEND}" From 7ef1508882679870a64ac63ce5fd5eb5449f0dde Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 29 May 2023 15:28:04 +0100 Subject: [PATCH 03/11] dev-lang/mujs: Stabilize 1.3.3 ppc, #907264 Signed-off-by: Sam James --- dev-lang/mujs/mujs-1.3.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/mujs/mujs-1.3.3.ebuild b/dev-lang/mujs/mujs-1.3.3.ebuild index 1984d68dbaf12..97932e6e21f41 100644 --- a/dev-lang/mujs/mujs-1.3.3.ebuild +++ b/dev-lang/mujs/mujs-1.3.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.gz" LICENSE="ISC" # The subslot matches the SONAME SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos" RDEPEND="sys-libs/readline:=" DEPEND="${RDEPEND}" From 16fd5fc357f6faed08c4e0a7ab1a539ecd5ccc51 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 29 May 2023 15:28:06 +0100 Subject: [PATCH 04/11] dev-lang/mujs: Stabilize 1.3.3 amd64, #907264 Signed-off-by: Sam James --- dev-lang/mujs/mujs-1.3.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/mujs/mujs-1.3.3.ebuild b/dev-lang/mujs/mujs-1.3.3.ebuild index 97932e6e21f41..35267ff12b641 100644 --- a/dev-lang/mujs/mujs-1.3.3.ebuild +++ b/dev-lang/mujs/mujs-1.3.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.gz" LICENSE="ISC" # The subslot matches the SONAME SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos" RDEPEND="sys-libs/readline:=" DEPEND="${RDEPEND}" From c914d9d44da1acfaec030a9d545c2509d8276693 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 29 May 2023 15:28:08 +0100 Subject: [PATCH 05/11] dev-lang/mujs: Stabilize 1.3.3 ppc64, #907264 Signed-off-by: Sam James --- dev-lang/mujs/mujs-1.3.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/mujs/mujs-1.3.3.ebuild b/dev-lang/mujs/mujs-1.3.3.ebuild index 35267ff12b641..5988b07b1eae8 100644 --- a/dev-lang/mujs/mujs-1.3.3.ebuild +++ b/dev-lang/mujs/mujs-1.3.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.gz" LICENSE="ISC" # The subslot matches the SONAME SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos" RDEPEND="sys-libs/readline:=" DEPEND="${RDEPEND}" From fc6be70828e7c1627344acd7c882caa92e43d8a3 Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 29 May 2023 15:28:10 +0100 Subject: [PATCH 06/11] dev-lang/mujs: Stabilize 1.3.3 sparc, #907264 Signed-off-by: Sam James --- dev-lang/mujs/mujs-1.3.3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/mujs/mujs-1.3.3.ebuild b/dev-lang/mujs/mujs-1.3.3.ebuild index 5988b07b1eae8..a4c0c10c9f34d 100644 --- a/dev-lang/mujs/mujs-1.3.3.ebuild +++ b/dev-lang/mujs/mujs-1.3.3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://mujs.com/downloads/${P}.tar.gz" LICENSE="ISC" # The subslot matches the SONAME SLOT="0/${PV}" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos" RDEPEND="sys-libs/readline:=" DEPEND="${RDEPEND}" From de882da94fb3ba0c387ad349c549f10c46b3d43e Mon Sep 17 00:00:00 2001 From: Sam James Date: Mon, 29 May 2023 15:28:12 +0100 Subject: [PATCH 07/11] x11-misc/xpad: Stabilize 5.8.0-r1 amd64, #907267 Signed-off-by: Sam James --- x11-misc/xpad/xpad-5.8.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x11-misc/xpad/xpad-5.8.0-r1.ebuild b/x11-misc/xpad/xpad-5.8.0-r1.ebuild index 4c5b67b4ce677..167db33db01b4 100644 --- a/x11-misc/xpad/xpad-5.8.0-r1.ebuild +++ b/x11-misc/xpad/xpad-5.8.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm ~x86" RDEPEND=" >=app-accessibility/at-spi2-core-2.46.0:2 From abf991dec55ad184490689e7fbf8aab266329b80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 27 May 2023 07:34:35 +0200 Subject: [PATCH 08/11] distutils-r1.eclass: Use CYTHON_FORCE_REGEN=1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- eclass/distutils-r1.eclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index ec1dd08b197c6..6835444d3c5fe 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -1828,6 +1828,10 @@ distutils-r1_run_phase() { if [[ ${DISTUTILS_EXT} ]]; then local -x CPPFLAGS="${CPPFLAGS} $(usex debug '-UNDEBUG' '-DNDEBUG')" + # always generate .c files from .pyx files to ensure we get latest + # bug fixes from Cython (this works only when setup.py is using + # cythonize() but it's better than nothing) + local -x CYTHON_FORCE_REGEN=1 fi # How to build Python modules in different worlds... From 677b69f23cb3c0e021a21b8a775b1da3143fd564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 27 May 2023 07:35:33 +0200 Subject: [PATCH 09/11] distutils-r1.eclass: Include dev-python/cython version in log MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- eclass/distutils-r1.eclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index 6835444d3c5fe..bea3cea56c999 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -925,6 +925,11 @@ _distutils-r1_print_package_versions() { dev-python/gpep517 dev-python/installer ) + if [[ ${DISTUTILS_EXT} ]]; then + packages+=( + dev-python/cython + ) + fi case ${DISTUTILS_USE_PEP517} in flit) packages+=( From 07b36848aee42bc23074247c4eb745de2033b72a Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Sat, 27 May 2023 11:07:22 +0300 Subject: [PATCH 10/11] distutils-r1.eclass: Bump min dep versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Arthur Zamarin Signed-off-by: Michał Górny --- eclass/distutils-r1.eclass | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass index bea3cea56c999..0ccd59fb6c781 100644 --- a/eclass/distutils-r1.eclass +++ b/eclass/distutils-r1.eclass @@ -220,7 +220,7 @@ _distutils_set_globals() { ;; hatchling) bdep+=' - >=dev-python/hatchling-1.12.2[${PYTHON_USEDEP}] + >=dev-python/hatchling-1.17.0[${PYTHON_USEDEP}] ' ;; jupyter) @@ -230,7 +230,7 @@ _distutils_set_globals() { ;; maturin) bdep+=' - >=dev-util/maturin-0.14.10[${PYTHON_USEDEP}] + >=dev-util/maturin-0.14.17[${PYTHON_USEDEP}] ' ;; no) @@ -239,7 +239,7 @@ _distutils_set_globals() { ;; meson-python) bdep+=' - >=dev-python/meson-python-0.12.0[${PYTHON_USEDEP}] + >=dev-python/meson-python-0.12.1[${PYTHON_USEDEP}] ' ;; pbr) @@ -249,23 +249,23 @@ _distutils_set_globals() { ;; pdm) bdep+=' - >=dev-python/pdm-pep517-1.0.6[${PYTHON_USEDEP}] + >=dev-python/pdm-pep517-1.1.4[${PYTHON_USEDEP}] ' ;; poetry) bdep+=' - >=dev-python/poetry-core-1.4.0[${PYTHON_USEDEP}] + >=dev-python/poetry-core-1.5.2[${PYTHON_USEDEP}] ' ;; setuptools) bdep+=' - >=dev-python/setuptools-67.2.0[${PYTHON_USEDEP}] - >=dev-python/wheel-0.38.4[${PYTHON_USEDEP}] + >=dev-python/setuptools-67.7.2[${PYTHON_USEDEP}] + >=dev-python/wheel-0.40.0[${PYTHON_USEDEP}] ' ;; sip) bdep+=' - >=dev-python/sip-6.7.5-r1[${PYTHON_USEDEP}] + >=dev-python/sip-6.7.8[${PYTHON_USEDEP}] ' ;; standalone) @@ -600,7 +600,7 @@ distutils_enable_tests() { test_pkg=">=dev-python/nose-1.3.7_p20221026" ;; pytest) - test_pkg=">=dev-python/pytest-7.2.1" + test_pkg=">=dev-python/pytest-7.3.1" ;; setup.py) ;; From 0b140f9228e2ed7e76124986d2911776922cd342 Mon Sep 17 00:00:00 2001 From: Arthur Zamarin Date: Sat, 27 May 2023 11:22:33 +0300 Subject: [PATCH 11/11] python-utils-r1.eclass: Bump min dep versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Arthur Zamarin Signed-off-by: Michał Górny Closes: https://github.com/gentoo/gentoo/pull/31180 Signed-off-by: Michał Górny --- eclass/python-utils-r1.eclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 40792714cc56e..52e9e061d6bd3 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -441,13 +441,13 @@ _python_export() { local d case ${impl} in python3.10) - PYTHON_PKG_DEP=">=dev-lang/python-3.10.9-r1:3.10";; + PYTHON_PKG_DEP=">=dev-lang/python-3.10.11:3.10";; python3.11) - PYTHON_PKG_DEP=">=dev-lang/python-3.11.1-r1:3.11";; + PYTHON_PKG_DEP=">=dev-lang/python-3.11.3:3.11";; python3.12) PYTHON_PKG_DEP=">=dev-lang/python-3.12.0_beta1:3.12";; pypy3) - PYTHON_PKG_DEP='>=dev-python/pypy3-7.3.11-r1:0=';; + PYTHON_PKG_DEP='>=dev-python/pypy3-7.3.11_p1:0=';; *) die "Invalid implementation: ${impl}" esac