Merge updates from master

2026-07-15 18:13:10 -04:00 · 2024-04-13 17:18:17 +00:00
parent 4ce993de97 dc52ffb26a
commit 8300a1f1cf
19 changed files with 130 additions and 151 deletions
--- a/dev-python/aspectlib/Manifest
+++ b/dev-python/aspectlib/Manifest
@@ -1,2 +1 @@
-DIST aspectlib-2.0.0.gh.tar.gz 149206 BLAKE2B 79a9cdd6090181e28bb9f46b5dc71b5a49c6fe356f0d4687886df2b6d83867a8a8bd51e43506da09b78e3ae637a1f1257888656fd2ecb0f583986424f89d3d14 SHA512 455ae7bb7808158abc79814632cd108397bfffc4d6c5e0f8a041ca03ed0f0fc2022d0929ad3a29e9015d8b3e3b02afa071c9b28fc62845eac4f6ef8c3fa2d9b2
 DIST aspectlib-2.0.0.tar.gz 156591 BLAKE2B b3800164e25e4414fe502fc62efcce163070d743cd1f4ebc6f95a51123895cf0ce72f1df5088a580a345f48b2dd03cf30340b4a7b27c0cf6ecab614e6e79da38 SHA512 3611d3f887febae8a60df6ad5567437adaa2105e6622a7d9b543c02f593c9dee43002cd91b89f5d005fc70a8b197b5c568eefa3a0fdb6fc05665f4a1c5107316
--- a/dev-python/aspectlib/aspectlib-2.0.0.ebuild
+++ b/dev-python/aspectlib/aspectlib-2.0.0.ebuild
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="An aspect-oriented programming, monkey-patch and decorators library"
-HOMEPAGE="
-	https://github.com/ionelmc/python-aspectlib
-	https://pypi.org/project/python-aspectlib/
-"
-SRC_URI="https://github.com/ionelmc/python-${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-RDEPEND="dev-python/fields[${PYTHON_USEDEP}]"
-BDEPEND="test? (
-	dev-python/process-tests[${PYTHON_USEDEP}]
-	dev-python/tornado[${PYTHON_USEDEP}]
-)"
-
-S="${WORKDIR}/python-${P}"
-
-distutils_enable_tests pytest
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-py3doc-enhanced-theme
-
-EEPYTEST_DESELECT=(
-	# fails because error message text is slightly different
-	tests/test_aspectlib_test.py::test_story_empty_play_proxy_class
-	tests/test_aspectlib_test.py::test_story_half_play_proxy_class
-)
--- a/dev-python/aspectlib/metadata.xml
+++ b/dev-python/aspectlib/metadata.xml
@@ -4,7 +4,7 @@
 	<!-- maintainer-needed -->
 	<longdescription lang="en">
 An aspect-oriented programming, monkey-patch and decorators library. It is useful when changing behavior in existing code is desired. It includes tools for debugging and testing: simple mock/record and a complete capture/replay framework.
-  </longdescription>
+	</longdescription>
 	<upstream>
 		<remote-id type="github">ionelmc/python-aspectlib</remote-id>
 		<remote-id type="pypi">aspectlib</remote-id>
--- a/dev-python/base58/base58-2.1.1-r1.ebuild
+++ b/dev-python/base58/base58-2.1.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 pypi

--- a/dev-python/billiard/billiard-4.0.2.ebuild
+++ b/dev-python/billiard/billiard-4.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1

--- a/dev-python/biplist/biplist-1.0.3.ebuild
+++ b/dev-python/biplist/biplist-1.0.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_11 )
+PYTHON_COMPAT=( python3_{11..12} )

 inherit distutils-r1 pypi

--- a/dev-python/click-command-tree/click-command-tree-1.1.1.ebuild
+++ b/dev-python/click-command-tree/click-command-tree-1.1.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10,11} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit distutils-r1

 DESCRIPTION="click plugin to show the command tree of your CLI"
--- a/dev-python/click-repl/Manifest
+++ b/dev-python/click-repl/Manifest
@@ -1 +1 @@
-DIST click-repl-0.2.0.tar.gz 7014 BLAKE2B b02c7d858971f655ba880c6f66ff0a5c1b3c1aeb83782807c04d862430841761caa8a7a72d2d110a9706272cf2cd818b6976db14315c885bea95e8ef991ef9df SHA512 888ef2d4082cbecbdab70d707296b20d3dcc0a13fe06ef103fbe04a3f29381fe0f3284c2eb38c6d3eb8b026063cba470a519524e98b9eadd06a5946c669ffc3b
+DIST click-repl-0.2.0.gh.tar.gz 7014 BLAKE2B b02c7d858971f655ba880c6f66ff0a5c1b3c1aeb83782807c04d862430841761caa8a7a72d2d110a9706272cf2cd818b6976db14315c885bea95e8ef991ef9df SHA512 888ef2d4082cbecbdab70d707296b20d3dcc0a13fe06ef103fbe04a3f29381fe0f3284c2eb38c6d3eb8b026063cba470a519524e98b9eadd06a5946c669ffc3b
--- a/dev-python/click-repl/click-repl-0.2.0-r1.ebuild
+++ b/dev-python/click-repl/click-repl-0.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1

@@ -12,7 +12,7 @@ HOMEPAGE="
 	https://github.com/click-contrib/click-repl
 	https://pypi.org/project/click-repl/
 "
-SRC_URI="https://github.com/click-contrib/click-repl/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/click-contrib/click-repl/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"

 LICENSE="MIT"
 SLOT="0"
--- a/dev-python/codecov/codecov-2.1.12.ebuild
+++ b/dev-python/codecov/codecov-2.1.12.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )

 inherit distutils-r1

--- a/dev-python/cryptg/cryptg-0.4.ebuild
+++ b/dev-python/cryptg/cryptg-0.4.ebuild
@@ -1,83 +1,83 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 CRATES="
-	aes-0.7.5
-	autocfg-1.1.0
-	base64ct-1.5.3
-	bitflags-1.3.2
-	block-buffer-0.9.0
-	cfg-if-1.0.0
-	cipher-0.3.0
-	core2-0.4.0
-	cpufeatures-0.2.5
-	crypto-mac-0.11.1
-	digest-0.9.0
-	generic-array-0.14.6
-	getrandom-0.2.8
-	glass_pumpkin-1.3.0
-	grammers-crypto-0.4.0
-	hmac-0.11.0
-	indoc-1.0.7
-	lazy_static-1.4.0
-	libc-0.2.137
-	lock_api-0.4.9
-	memchr-2.5.0
-	memoffset-0.6.5
-	num-bigint-0.4.3
-	num-integer-0.1.45
-	num-traits-0.2.15
-	once_cell-1.15.0
-	opaque-debug-0.3.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.4
-	password-hash-0.2.3
-	pbkdf2-0.8.0
-	ppv-lite86-0.2.16
-	proc-macro2-1.0.47
-	pyo3-0.17.2
-	pyo3-build-config-0.17.2
-	pyo3-ffi-0.17.2
-	pyo3-macros-0.17.2
-	pyo3-macros-backend-0.17.2
-	quote-1.0.21
-	rand-0.8.5
-	rand_chacha-0.3.1
-	rand_core-0.6.4
-	redox_syscall-0.2.16
-	scopeguard-1.1.0
-	sha1-0.6.1
-	sha1_smol-1.0.0
-	sha2-0.9.9
-	smallvec-1.10.0
-	subtle-2.4.1
-	syn-1.0.103
-	target-lexicon-0.12.4
-	typenum-1.15.0
-	unicode-ident-1.0.5
-	unindent-0.1.10
-	version_check-0.9.4
-	wasi-0.11.0+wasi-snapshot-preview1
-	windows-sys-0.42.0
-	windows_aarch64_gnullvm-0.42.0
-	windows_aarch64_msvc-0.42.0
-	windows_i686_gnu-0.42.0
-	windows_i686_msvc-0.42.0
-	windows_x86_64_gnu-0.42.0
-	windows_x86_64_gnullvm-0.42.0
-	windows_x86_64_msvc-0.42.0
+	aes@0.7.5
+	autocfg@1.1.0
+	base64ct@1.5.3
+	bitflags@1.3.2
+	block-buffer@0.9.0
+	cfg-if@1.0.0
+	cipher@0.3.0
+	core2@0.4.0
+	cpufeatures@0.2.5
+	crypto-mac@0.11.1
+	digest@0.9.0
+	generic-array@0.14.6
+	getrandom@0.2.8
+	glass_pumpkin@1.3.0
+	grammers-crypto@0.4.0
+	hmac@0.11.0
+	indoc@1.0.7
+	lazy_static@1.4.0
+	libc@0.2.137
+	lock_api@0.4.9
+	memchr@2.5.0
+	memoffset@0.6.5
+	num-bigint@0.4.3
+	num-integer@0.1.45
+	num-traits@0.2.15
+	once_cell@1.15.0
+	opaque-debug@0.3.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.4
+	password-hash@0.2.3
+	pbkdf2@0.8.0
+	ppv-lite86@0.2.16
+	proc-macro2@1.0.47
+	pyo3@0.17.2
+	pyo3-build-config@0.17.2
+	pyo3-ffi@0.17.2
+	pyo3-macros@0.17.2
+	pyo3-macros-backend@0.17.2
+	quote@1.0.21
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	redox_syscall@0.2.16
+	scopeguard@1.1.0
+	sha1@0.6.1
+	sha1_smol@1.0.0
+	sha2@0.9.9
+	smallvec@1.10.0
+	subtle@2.4.1
+	syn@1.0.103
+	target-lexicon@0.12.4
+	typenum@1.15.0
+	unicode-ident@1.0.5
+	unindent@0.1.10
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	windows-sys@0.42.0
+	windows_aarch64_gnullvm@0.42.0
+	windows_aarch64_msvc@0.42.0
+	windows_i686_gnu@0.42.0
+	windows_i686_msvc@0.42.0
+	windows_x86_64_gnu@0.42.0
+	windows_x86_64_gnullvm@0.42.0
+	windows_x86_64_msvc@0.42.0
 "
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )

 inherit cargo distutils-r1

 DESCRIPTION="Hachoir is a Python library to view and edit a binary stream field by field "
 HOMEPAGE="https://github.com/cher-nov/cryptg/"
 SRC_URI="https://github.com/cher-nov/cryptg/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	$(cargo_crate_uris)
+	${CARGO_CRATE_URIS}
 "

 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 MIT Unicode-DFS-2016 Unlicense"
--- a/dev-python/cx-oracle/cx-oracle-8.3.0-r1.ebuild
+++ b/dev-python/cx-oracle/cx-oracle-8.3.0-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI="8"

-PYTHON_COMPAT=( python3_10 )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_EXT=1
+PYTHON_COMPAT=( python3_{10..12} )
 PYPI_PN="cx_Oracle"
 PYPI_NO_NORMALIZE=1

@@ -27,22 +29,9 @@ RESTRICT="test"
 DEPEND="dev-db/oracle-instantclient"
 RDEPEND="${DEPEND}"

-python_prepare_all() {
+src_prepare() {
 	# do not install LICENSE and README to /usr/
 	sed -i -e '/data_files/d' setup.py || die

-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	return
-	# no python_mod_optimize
-}
-
-src_install() {
-	distutils-r1_src_install
-	if use examples; then
-		docinto examples
-		dodoc -r samples/. || die
-	fi
+	distutils-r1_src_prepare
 }
--- a/games-util/mangohud/mangohud-0.7.1.ebuild
+++ b/games-util/mangohud/mangohud-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -124,7 +124,8 @@ src_prepare() {
 	find . -type f -exec sed -i 's|"imgui_internal.h"|<imgui/imgui_internal.h>|g' {} \; || die

 	# replace imgui_dep in implot build file
-	sed -i -r -e 's|(imgui_dep = ).*|\1dependency('\'imgui\'')|' -e '/imgui_sp/d' "${S}/subprojects/implot-${IMPLOT_VER}/meson.build" || die
+	sed -i -r -e 's|(imgui_dep = ).*|\1dependency('\'imgui\'')|' \
+		-e '/imgui_sp/d' "${S}/subprojects/implot-${IMPLOT_VER}/meson.build" || die
 }

 multilib_src_configure() {
--- a/games-util/mangohud/mangohud-9999.ebuild
+++ b/games-util/mangohud/mangohud-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -124,7 +124,8 @@ src_prepare() {
 	find . -type f -exec sed -i 's|"imgui_internal.h"|<imgui/imgui_internal.h>|g' {} \; || die

 	# replace imgui_dep in implot build file
-	sed -i -r -e 's|(imgui_dep = ).*|\1dependency('\'imgui\'')|' -e '/imgui_sp/d' "${S}/subprojects/implot-${IMPLOT_VER}/meson.build" || die
+	sed -i -r -e 's|(imgui_dep = ).*|\1dependency('\'imgui\'')|' \
+		-e '/imgui_sp/d' "${S}/subprojects/implot-${IMPLOT_VER}/meson.build" || die
 }

 multilib_src_configure() {
--- a/games-util/mangohud/metadata.xml
+++ b/games-util/mangohud/metadata.xml
@@ -9,7 +9,7 @@
 		<email>gonegrier.duarte@gmail.com</email>
 		<name>Gonçalo Negrier Duarte</name>
 	</maintainer>
-    <upstream>
+	<upstream>
 		<remote-id type="github">flightlessmango/MangoHud</remote-id>
 		<bugs-to>https://github.com/flightlessmango/MangoHud/issues</bugs-to>
 	</upstream>
--- a/gui-apps/hyprlock/files/0002-cmake-install-pam-file-fix.patch
+++ b/gui-apps/hyprlock/files/0002-cmake-install-pam-file-fix.patch
@@ -0,0 +1,24 @@
+From d9a6229434fba475ea42b634ee2f03919236798d Mon Sep 17 00:00:00 2001
+From: Vaxry <vaxry@vaxry.net>
+Date: Wed, 10 Apr 2024 22:42:54 +0100
+Subject: [PATCH] pam: always install pam file
+
+---
+ CMakeLists.txt | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e4d73c4..3cc75f1 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -83,9 +83,4 @@ protocol("unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml" "linux-dmabuf-unst
+ # Installation
+ install(TARGETS hyprlock)
+ 
+-install(CODE "
+-    if (NOT EXISTS \"${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d/hyprlock\")
+-        install(FILES \"${CMAKE_SOURCE_DIR}/pam/hyprlock\" DESTINATION \"${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d\")
+-    endif()
+-")
+-
+install(FILES ${CMAKE_SOURCE_DIR}/pam/hyprlock DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/pam.d)
--- a/gui-apps/hyprlock/hyprlock-0.3.0-r1.ebuild
+++ b/gui-apps/hyprlock/hyprlock-0.3.0-r1.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-inherit cmake toolchain-funcs
+inherit cmake

 DESCRIPTION="Hyprland's GPU-accelerated screen locking utility"
 HOMEPAGE="https://github.com/hyprwm/hyprlock"
@@ -46,6 +46,7 @@ BDEPEND="

 PATCHES=(
 	"${FILESDIR}/0001-fix-CFLAGS-CXXFLAGS-hyprlock.patch"
+	"${FILESDIR}/0002-cmake-install-pam-file-fix.patch"
 )

 src_configure() {
--- a/gui-apps/hyprlock/hyprlock-9999.ebuild
+++ b/gui-apps/hyprlock/hyprlock-9999.ebuild
@@ -3,9 +3,8 @@

 EAPI=8

-inherit cmake toolchain-funcs
+inherit cmake

-COMMIT="57e80006602b7857fb23feded368055df62b8cb3"
 DESCRIPTION="Hyprland's GPU-accelerated screen locking utility"
 HOMEPAGE="https://github.com/hyprwm/hyprlock"

@@ -13,12 +12,8 @@ if [[ "${PV}" = *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
 else
-	#When releases start to happen
-	#SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz"
-	#S="${WORKDIR}/${PN}-source"
-
-	SRC_URI="https://github.com/hyprwm/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.gh.tar.gz"
-	S="${WORKDIR}/${PN}-${COMMIT}"
+	SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-${PV}"

 	KEYWORDS="~amd64"
 fi
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -14,6 +14,13 @@

 # New entries go on top.

+# Julien Roy <julien@jroy.ca> (2024-04-13)
+# Mask stale/unmaintained packages for removal in 30 days
+# Unmaintained upstream, runtime failure on >=dev-lang/python-3.9
+dev-python/clufter
+# Deprecated upstream, replaced by oracledb, no revdeps
+dev-python/cx-oracle
+
 # Julien Roy <julien@jroy.ca> (2024-04-13)
 # Depends on last rited dev-python/future
 # Masked for removal in 30 days