Merge updates from master

2026-07-11 08:03:16 -04:00 · 2025-05-04 14:39:18 +00:00
parent eecd67da86 a01dfded05
commit c275c4dfc0
36 changed files with 249 additions and 249 deletions
--- a/dev-python/lsprotocol/Manifest
+++ b/dev-python/lsprotocol/Manifest
@@ -0,0 +1 @@
+DIST lsprotocol-2023.0.1.gh.tar.gz 249558 BLAKE2B 721746afd7f2b639ff008e589388d592b190d2ac7073158018f6e88f015003ded1b9b5def86f10d76a2ffd98d65b4cb917776a5e423e197bd0a0885c3332bacc SHA512 e929125f259240feb757c55a62ca4ee021e9727884dc5b7465894aa5d5a3cf13235f9b863af862ae1f1c04f1eaa3de6356cf7abecc6efa1979facaecbfb45e64
--- a/dev-python/lsprotocol/lsprotocol-2023.0.1.ebuild
+++ b/dev-python/lsprotocol/lsprotocol-2023.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{11..13})
+
+inherit distutils-r1
+
+DESCRIPTION="Language Server Protocol types code generator & packages"
+HOMEPAGE="
+	https://github.com/microsoft/lsprotocol
+	https://pypi.org/project/lsprotocol/
+"
+SRC_URI="
+	https://github.com/microsoft/${PN}/archive/refs/tags/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${S}/packages/python"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+RESTRICT="test" # Tests only available for the top-level module, which we aren't interested in
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/cattrs[${PYTHON_USEDEP}]
+"
--- a/dev-python/lsprotocol/metadata.xml
+++ b/dev-python/lsprotocol/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<name>Moritz Brunner</name>
+		<email>moritz.brunner+gentoo@posteo.de</email>
+	</maintainer>
+	<stabilize-allarches />
+	<upstream>
+		<remote-id type="pypi">lsprotocol</remote-id>
+		<remote-id type="github">microsoft/lsprotocol</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/python-lsp-isort/Manifest
+++ b/dev-python/python-lsp-isort/Manifest
@@ -1 +1 @@
-DIST python-lsp-isort-0.2.0.gh.tar.gz 5216 BLAKE2B 32d22c97e3c0add1bf808a27a94fda415c1250669130f86c7aab2d81da6fb9a7efc4ad3b23300d8418e0b60d70bd5831958e3427f4489d8d17405885d3ad1e86 SHA512 26b05e8fed70dca268c9ff6714d2b9ad68fda86ab4d9cb8893df1eaefc517e123945c5fe8928e94f646171ff2d0c2f33e9b058a784d2bf4dd31acf9f2aef1e6a
+DIST python-lsp-isort-0.2.1.gh.tar.gz 6391 BLAKE2B 82ed926ac7dede65bbf8cce18f427070811c9c696d1d03d5cef7a3f6ff2e9e6b782c5283d45140537c238d09fd24fdea43c4bc4dad591095aa948f11169d72ab SHA512 5f597632ea21b850b815adc3e2609ad93159813e00380205d843df3d32ab2731cc945988813d86d99f54fe27380730ae899651636c99fddcbff081c1bd58129d
--- a/dev-python/python-lsp-isort/python-lsp-isort-0.2.1.ebuild
+++ b/dev-python/python-lsp-isort/python-lsp-isort-0.2.1.ebuild
@@ -3,7 +3,7 @@

 EAPI=8

-DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_USE_PEP517=hatchling
 PYTHON_COMPAT=( python3_{11..13} )

 inherit distutils-r1
--- a/dev-python/sjcl/sjcl-0.2.1-r1.ebuild
+++ b/dev-python/sjcl/sjcl-0.2.1-r1.ebuild
@@ -20,9 +20,12 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"

-distutils_enable_tests setup.py
-
 RDEPEND="
 	dev-python/pycryptodome[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+
+python_test() {
+	# Uses unittest which is builtin
+	"${EPYTHON?}" tests/simple.py || die
+}
--- a/gui-apps/hypridle/Manifest
+++ b/gui-apps/hypridle/Manifest
@@ -1 +1,2 @@
 DIST hypridle-0.1.5.gh.tar.gz 13946 BLAKE2B 119e3256bae56dea0c234b687e82e852cfa98c6b2f06a70ad59785900687bbbeba0ad431b4024e7c08c7fc2fd2776342b58853994a8c53a10a4eec4ef50198d8 SHA512 3574411a49da83a3f476aa5b6ee3fa7943d9c0018d0a111ca4f609d8bb5b7f485ab7006cd10e0094031c67fa6e1a754e46362ac514b58d60a66d7577d9933968
+DIST hypridle-0.1.6.gh.tar.gz 17053 BLAKE2B 33e704905a0d9353b61b23631a851e1ac1b6d5fc9601a9b0d1fafc379bf1d4763bb2d2cde478ae2a296be26c0ebbefc838ff156fb2a961e03c4dab69a3a784bd SHA512 63d266da4b5a45cc7fef4b2a40df32e83e0797b1b5b6a7ce4d0d93c463e53797ae5d8a8ea7d3174747bc0cc7c546fc1468e4d072b767b6bdb9dbcafaa7496de8
--- a/gui-apps/hypridle/hypridle-0.1.6.ebuild
+++ b/gui-apps/hypridle/hypridle-0.1.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Hyprland's idle daemon"
+HOMEPAGE="https://github.com/hyprwm/hypridle"
+
+if [[ "${PV}" = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
+else
+	SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+RDEPEND="
+	dev-cpp/sdbus-c++:0/2
+	>=dev-libs/hyprlang-0.4.0
+	dev-libs/wayland
+	gui-libs/hyprutils:=
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/wayland-protocols
+"
+
+BDEPEND="
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.1.5-fix-CFLAGS-CXXFLAGS.patch"
+)
--- a/gui-apps/hypridle/hypridle-9999.ebuild
+++ b/gui-apps/hypridle/hypridle-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -20,10 +20,10 @@ LICENSE="BSD"
 SLOT="0"

 RDEPEND="
-	>=dev-cpp/sdbus-c++-0.2.0
+	dev-cpp/sdbus-c++:0/2
 	>=dev-libs/hyprlang-0.4.0
-	>=gui-libs/hyprutils-0.2.0:=
 	dev-libs/wayland
+	gui-libs/hyprutils:=
 "
 DEPEND="
 	${RDEPEND}
@@ -36,5 +36,5 @@ BDEPEND="
 "

 PATCHES=(
-	"${FILESDIR}/hypridle-9999-fix-CFLAGS-CXXFLAGS.patch"
+	"${FILESDIR}/${P}-fix-CFLAGS-CXXFLAGS.patch"
 )
--- a/gui-apps/hyprlock/Manifest
+++ b/gui-apps/hyprlock/Manifest
@@ -1,2 +1,2 @@
-DIST hyprlock-0.6.0.tar.gz 71344 BLAKE2B 77dbe7c4061c0d52663e286e701e1819f10194515130126078375f26e1b58d7cb74d7b980e6587751a65ccf762bbcb0cd6ff6fb9fedc375c891f5d6cff773de4 SHA512 d8931b44db0d25a2665a3b1a2a8656724ffd2d09effab37f0c53e40367637899f7040d96a0886202c6d4d5fb03e477a4fc351cbd31b81cdb715e180bc8dde6c2
 DIST hyprlock-0.7.0.tar.gz 79446 BLAKE2B 30d227205252afc75946eba47fe526051ac011f8441539f1322285014c4511a8bfee0d84f848341d9bccda0f6a672cf27e4ea314346a905942f50932578ce134 SHA512 f8fa0e2b4ee86563d9c8c4761b4b220e3cdf4a53fa6d39b427d7c3a8cd904e8094c8a324ea32564cb08db44e392c703d25e8125fbafbd444e0cfb9f89bea336e
+DIST hyprlock-0.8.2.tar.gz 80394 BLAKE2B a1bc646e025006d9cd59b39681692d8519a46e4bd79b319ecf2f5bee1f5bd04fc4374efc0027f1334cf2c4eb0ae4e54e01f84bbc67c2a75a4a9b22a2a7281464 SHA512 000057d2ebdb1d1e3a7cb38201afb1f02b4bb77f180283d85f117a9306e739964c7f33ee63124aa6e2f292ebdda40a2c5cb6114f5b0c557f2cbc6ff2e7daff56
--- a/gui-apps/hyprlock/files/hyprlock-0.6.0-explicitly-require-gles3.patch
+++ b/gui-apps/hyprlock/files/hyprlock-0.6.0-explicitly-require-gles3.patch
@@ -1,37 +0,0 @@
-https://github.com/hyprwm/hyprlock/commit/023aff52ad45a3c55144c6bbda33395dfb9e9db0
-https://bugs.gentoo.org/947781
-Allow building on a system that lacks GLX support.
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
-+cmake_minimum_required(VERSION 3.27)
- 
- file(READ "${CMAKE_SOURCE_DIR}/VERSION" VER_RAW)
- string(STRIP ${VER_RAW} VERSION)
-@@ -37,7 +37,7 @@ message(STATUS "Checking deps...")
- 
- find_package(Threads REQUIRED)
- find_package(PkgConfig REQUIRED)
-find_package(OpenGL REQUIRED)
-+find_package(OpenGL REQUIRED COMPONENTS EGL GLES3)
- pkg_check_modules(
-   deps
-   REQUIRED
-@@ -47,7 +47,6 @@ pkg_check_modules(
-   wayland-egl
-   hyprlang>=0.4.0
-   egl
-  opengl
-   xkbcommon
-   libjpeg
-   libwebp
-@@ -63,7 +62,7 @@ pkg_check_modules(
- file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
- add_executable(hyprlock ${SRCFILES})
- target_link_libraries(hyprlock PRIVATE pam rt Threads::Threads PkgConfig::deps
-                                       OpenGL::EGL OpenGL::GL)
-+                                       OpenGL::EGL OpenGL::GLES3)
- 
- # protocols
- find_program(WaylandScanner NAMES wayland-scanner)
--- a/gui-apps/hyprlock/hyprlock-0.8.2.ebuild
+++ b/gui-apps/hyprlock/hyprlock-0.8.2.ebuild
@@ -21,20 +21,21 @@ SLOT="0"

 RDEPEND="
 	dev-cpp/sdbus-c++:0/2
-	dev-libs/hyprgraphics
-	>=dev-libs/hyprlang-0.4.0
-	>=gui-libs/hyprutils-0.2.6:=
 	dev-libs/date
 	dev-libs/glib:2
+	dev-libs/hyprgraphics
+	>=dev-libs/hyprlang-0.6.0
 	dev-libs/wayland
+	>=dev-util/hyprwayland-scanner-0.4.4
+	>=gui-libs/hyprutils-0.2.6:=
 	media-libs/libglvnd
 	media-libs/libjpeg-turbo:=
 	media-libs/libwebp:=
 	media-libs/mesa[opengl]
 	sys-libs/pam
 	x11-libs/cairo
-	x11-libs/libxkbcommon
 	x11-libs/libdrm
+	x11-libs/libxkbcommon
 	x11-libs/pango
 "
 DEPEND="
@@ -49,6 +50,4 @@ BDEPEND="

 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.1-fix-CFLAGS-CXXFLAGS.patch"
-	# bug #947781
-	"${FILESDIR}/${P}-explicitly-require-gles3.patch"
 )
--- a/gui-apps/hyprlock/hyprlock-9999.ebuild
+++ b/gui-apps/hyprlock/hyprlock-9999.ebuild
@@ -21,21 +21,21 @@ SLOT="0"

 RDEPEND="
 	dev-cpp/sdbus-c++:0/2
-	dev-libs/hyprgraphics
-	>=dev-libs/hyprlang-0.6.0
-	>=gui-libs/hyprutils-0.2.6:=
 	dev-libs/date
 	dev-libs/glib:2
+	dev-libs/hyprgraphics
+	>=dev-libs/hyprlang-0.6.0
 	dev-libs/wayland
 	>=dev-util/hyprwayland-scanner-0.4.4
+	>=gui-libs/hyprutils-0.2.6:=
 	media-libs/libglvnd
 	media-libs/libjpeg-turbo:=
 	media-libs/libwebp:=
 	media-libs/mesa[opengl]
 	sys-libs/pam
 	x11-libs/cairo
-	x11-libs/libxkbcommon
 	x11-libs/libdrm
+	x11-libs/libxkbcommon
 	x11-libs/pango
 "
 DEPEND="
--- a/gui-apps/hyprpicker/Manifest
+++ b/gui-apps/hyprpicker/Manifest
@@ -1,3 +1 @@
-DIST hyprpicker-0.3.0.gh.tar.gz 24591 BLAKE2B 5a2defcc6871a0fe0d6905097a9168934e5a5185b32f22349add43de4f4579d58a4b7f2e089ff42ac55589559575f6a7f923df128c289238dd812068ddfda6e3 SHA512 b6594e492bfaa17d16a6b5f864b939ab94963362575d50fc031145f7d17610e45e43c1c5ce5d098381297ab2089a2502ed69fcd97d11a9e9d8731d2e53359117
-DIST hyprpicker-0.4.2.gh.tar.gz 25167 BLAKE2B 05e8742e3ba0b32769aab96c9f643725d648aef1c404b6afc796a51c8ef63816945edd0c2fd924f76349b54204914ecfb37f2ec5c7e08cfe2b559efd73d634a5 SHA512 13ad07426405441442669546f90a332602f1e3869e004571c81443f004717b8cf03187f5787a1d9d317b6c2ab280aa00f47dcfca3e4b6403243fdfa14a5b68de
-DIST hyprpicker-0.4.3.gh.tar.gz 26418 BLAKE2B 0aed2ea771d4b8019a0e40f72322e451adf2b62e6de08ffceeed86b5fa9c97eed65a705969678b3b5d1efd3e496c3938943ba0be1ddbe810283e1b879530ad5e SHA512 030cf4880b54431f999365c457d53ce881c2488b2bfb154f94ce5138aaba9d6fe28636a0c1c4c4a06cf46441ff5c2733c262aa6136a4006f1f6e648208bc3aa8
+DIST hyprpicker-0.4.5.tar.gz 26380 BLAKE2B e975f9c91fa7b083e38818ca6475e4889499b7ccdcec005387171de1ab09cab3f92111da7e5fd7d90a96d3870cf3a878d1539077bd3f68e8b4e93e74947d147d SHA512 fb0bd78cd5fab48ad78499f248bdcf2b1af6ac8c6e0497d90b9fcfb47d5a4b70fa46ff6e4cc7347d061244cd71c22d67e6abdee2127c8edfbf5170337f888858
--- a/gui-apps/hyprpicker/hyprpicker-0.3.0-r2.ebuild
+++ b/gui-apps/hyprpicker/hyprpicker-0.3.0-r2.ebuild
@@ -1,30 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A wlroots-compatible Wayland color picker that does not suck"
-HOMEPAGE="https://github.com/hyprwm/hyprpicker"
-SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	>=gui-libs/hyprutils-0.2.0:=
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-libs/wayland-protocols
-	dev-util/wayland-scanner
-	media-libs/libglvnd
-	media-libs/libjpeg-turbo
-"
--- a/gui-apps/hyprpicker/hyprpicker-0.4.3.ebuild
+++ b/gui-apps/hyprpicker/hyprpicker-0.4.3.ebuild
@@ -1,32 +0,0 @@
-# Copyright 2024-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="wlroots-compatible Wayland color picker that does not suck"
-HOMEPAGE="https://github.com/hyprwm/hyprpicker"
-SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-libs/wayland
-	gui-libs/hyprutils:=
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	>=dev-util/hyprwayland-scanner-0.4.2
-	>=gui-libs/hyprutils-0.2.0
-"
-
-BDEPEND="
-	${RDEPEND}
-	dev-libs/wayland-protocols
-	dev-util/wayland-scanner
-	media-libs/libglvnd
-	media-libs/libjpeg-turbo
-"
--- a/gui-apps/hyprpicker/hyprpicker-0.4.5.ebuild
+++ b/gui-apps/hyprpicker/hyprpicker-0.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -7,23 +7,29 @@ inherit cmake

 DESCRIPTION="A wlroots-compatible Wayland color picker that does not suck"
 HOMEPAGE="https://github.com/hyprwm/hyprpicker"
-SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+if [[ "${PV}" = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
+else
+	SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"

 RDEPEND="
 	dev-libs/wayland
+	>=dev-util/hyprwayland-scanner-0.4.2
+	gui-libs/hyprutils:=
 	x11-libs/cairo
 	x11-libs/libxkbcommon
 	x11-libs/pango
-	>=dev-util/hyprwayland-scanner-0.4.2
-	>=gui-libs/hyprutils-0.2.0
 "
+DEPEND="${RDEPEND}"

 BDEPEND="
-	${RDEPEND}
 	dev-libs/wayland-protocols
 	dev-util/wayland-scanner
 	media-libs/libglvnd
--- a/gui-apps/hyprpicker/hyprpicker-9999.ebuild
+++ b/gui-apps/hyprpicker/hyprpicker-9999.ebuild
@@ -1,27 +1,35 @@
-# Copyright 2024 Gentoo Authors
+# Copyright 2024-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

-inherit cmake git-r3
+inherit cmake

 DESCRIPTION="A wlroots-compatible Wayland color picker that does not suck"
 HOMEPAGE="https://github.com/hyprwm/hyprpicker"
-EGIT_REPO_URI="https://github.com/hyprwm/${PN}.git/"
+
+if [[ "${PV}" = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
+else
+	SRC_URI="https://github.com/hyprwm/${PN^}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi

 LICENSE="BSD"
 SLOT="0"

 RDEPEND="
 	dev-libs/wayland
+	>=dev-util/hyprwayland-scanner-0.4.2
+	gui-libs/hyprutils:=
 	x11-libs/cairo
 	x11-libs/libxkbcommon
 	x11-libs/pango
-	>=gui-libs/hyprutils-0.2.0:=
 "
+DEPEND="${RDEPEND}"

 BDEPEND="
-	${RDEPEND}
 	dev-libs/wayland-protocols
 	dev-util/wayland-scanner
 	media-libs/libglvnd
--- a/media-sound/Tauon/Manifest
+++ b/media-sound/Tauon/Manifest
@@ -0,0 +1,2 @@
+DIST Tauon-7.9.0.tar.gz 1354787 BLAKE2B 2116c84ec687ec337e712aefa5da54b08e572b917c3a41d94687a95bfefd8d7a3276422b4e68cda8ed5f27f92a32bf491d41f1f4476e193f19ce927d6f6d02b4 SHA512 17b26b296385f3c2b6006a6a33453e5a277c8bc901f717bac3751bddc1691116e0bf116db9457e425d61d300200b5ca487f5b4949ca2be2993657be4fa9d87cf
+DIST Tauon-8.0.1.tar.gz 1668223 BLAKE2B 3d32d839440067ad11ddf76f6b188b82ba50ac6e45624fb8f96ca8f70721c1b6cf111092b76f92f7b06e57120555522dc5752ba2fd4bc7ce20133b7c7e358e37 SHA512 d7a17df12ea259a4ef4116f3690b5b0ac6a259e079747cfcf1fbef24f45b77024260d133a3a1d75ef371c3c0ddc6be36bed1dee440609a94ebdaabd2dc2828f7
--- a/media-sound/TauonMusicBox/TauonMusicBox-7.9.0.ebuild
+++ b/media-sound/TauonMusicBox/TauonMusicBox-7.9.0.ebuild
--- a/media-sound/Tauon/Tauon-8.0.1-r1.ebuild
+++ b/media-sound/Tauon/Tauon-8.0.1-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PLOCALES="cs de es fr_FR hu id it ja_JP nb_NO pl pt pt_BR pt_PT ru sv tr zh_CN"
+
+PYTHON_COMPAT=( python3_{12..13} )
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit desktop distutils-r1 optfeature plocale xdg
+
+DESCRIPTION="The desktop music player of today!"
+HOMEPAGE="https://tauonmusicbox.rocks/"
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_SUBMODULES=()
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Taiko2k/${PN}"
+else
+	SRC_URI="https://github.com/Taiko2k/Tauon/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+PHAZOR_DEPS="
+	dev-libs/miniaudio
+	media-libs/flac:=
+	media-libs/game-music-emu
+	media-libs/libopenmpt
+	media-libs/opus
+	media-libs/opusfile
+	media-libs/libsamplerate
+	media-libs/libvorbis
+	media-sound/mpg123
+	media-sound/wavpack
+	sci-libs/kissfft[-cpu_flags_x86_sse]
+"
+
+DEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/musicbrainzngs[${PYTHON_USEDEP}]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pysdl3[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setproctitle[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	media-video/ffmpeg
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	media-libs/sdl3-image
+
+	${PHAZOR_DEPS}
+"
+
+RDEPEND="
+	${DEPEND}
+
+	dev-libs/libayatana-appindicator
+	media-sound/mpg123-base
+	x11-libs/libnotify
+"
+
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.9.0-phazor-build.patch"
+	"${FILESDIR}/${PN}-8.0.1-fix-locale-path.patch"
+)
+
+src_compile() {
+	distutils-r1_src_compile
+
+	build_locale() {
+		msgfmt -o "locale/${1}/LC_MESSAGES/tauon.mo" "locale/${1}/LC_MESSAGES/tauon.po" || die
+	}
+
+	plocale_for_each_locale build_locale
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	install_locale() {
+		insinto "/usr/share/locale/${1}/LC_MESSAGES"
+		doins "locale/${1}/LC_MESSAGES/tauon.mo"
+	}
+
+	plocale_for_each_locale install_locale
+
+	sed -i 's/Exec=tauon/Exec=tauonmb/g' extra/tauonmb.desktop || die
+	domenu extra/tauonmb.desktop
+	doicon -s scalable extra/tauonmb.svg
+
+}
+
+pkg_postinst() {
+	optfeature "Chinese searches support" app-i18n/opencc[python]
+	optfeature "last fm support" dev-python/pylast
+	optfeature "PLEX support" dev-python/plexapi
+	optfeature "Spotify support" dev-python/tekore
+
+	xdg_pkg_postinst
+}
--- a/media-sound/TauonMusicBox/TauonMusicBox-8.0.1.ebuild
+++ b/media-sound/TauonMusicBox/TauonMusicBox-8.0.1.ebuild
@@ -22,8 +22,6 @@ else
 	KEYWORDS="~amd64"
 fi

-S="${WORKDIR}/Tauon-${PV}"
-
 LICENSE="GPL-3"
 SLOT="0"

--- a/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild
+++ b/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild
@@ -22,8 +22,6 @@ else
 	KEYWORDS="~amd64"
 fi

-S="${WORKDIR}/Tauon-${PV}"
-
 LICENSE="GPL-3"
 SLOT="0"

--- a/media-sound/TauonMusicBox/files/TauonMusicBox-7.9.0-phazor-build.patch
+++ b/media-sound/TauonMusicBox/files/TauonMusicBox-7.9.0-phazor-build.patch
--- a/media-sound/TauonMusicBox/files/TauonMusicBox-8.0.1-fix-locale-path.patch
+++ b/media-sound/TauonMusicBox/files/TauonMusicBox-8.0.1-fix-locale-path.patch
--- a/media-sound/TauonMusicBox/metadata.xml
+++ b/media-sound/TauonMusicBox/metadata.xml
--- a/media-sound/TauonMusicBox/Manifest
+++ b/media-sound/TauonMusicBox/Manifest
@@ -1,2 +0,0 @@
-DIST TauonMusicBox-7.9.0.tar.gz 1354787 BLAKE2B 2116c84ec687ec337e712aefa5da54b08e572b917c3a41d94687a95bfefd8d7a3276422b4e68cda8ed5f27f92a32bf491d41f1f4476e193f19ce927d6f6d02b4 SHA512 17b26b296385f3c2b6006a6a33453e5a277c8bc901f717bac3751bddc1691116e0bf116db9457e425d61d300200b5ca487f5b4949ca2be2993657be4fa9d87cf
-DIST TauonMusicBox-8.0.1.tar.gz 1668223 BLAKE2B 3d32d839440067ad11ddf76f6b188b82ba50ac6e45624fb8f96ca8f70721c1b6cf111092b76f92f7b06e57120555522dc5752ba2fd4bc7ce20133b7c7e358e37 SHA512 d7a17df12ea259a4ef4116f3690b5b0ac6a259e079747cfcf1fbef24f45b77024260d133a3a1d75ef371c3c0ddc6be36bed1dee440609a94ebdaabd2dc2828f7
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -124,12 +124,6 @@ gui-libs/text-engine
 # Removal on 2025-05-09. Bugs #912996, #916321, #926268, #932124
 games-emulation/duckstation

-# Vivian Heisz (demize) <demize@unstable.systems> (2025-04-04)
-# Unmaintained in GURU. Current versions are very old and have security
-# issues.
-# Removal on 2025-05-04. Bugs #934956, #937552.
-www-client/firefox-developer-bin
-
 # David Roman <davidroman96@gmail.com> (2025-03-12)
 # Uses deprecated EGO_SUM. Last release in 2023.
 # Removal on 2025-05-12
--- a/profiles/updates/2Q-2025
+++ b/profiles/updates/2Q-2025
@@ -0,0 +1 @@
+move media-sound/TauonMusicBox media-sound/Tauon
--- a/sci-electronics/dsview/dsview-1.3.0.ebuild
+++ b/sci-electronics/dsview/dsview-1.3.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 GITHUB_PN="DSView"
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )

 inherit cmake python-r1 udev xdg

--- a/sci-electronics/dsview/dsview-1.3.2.ebuild
+++ b/sci-electronics/dsview/dsview-1.3.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 GITHUB_PN="DSView"
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )

 inherit cmake python-r1 udev xdg

--- a/sci-electronics/dsview/dsview-9999.ebuild
+++ b/sci-electronics/dsview/dsview-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8

 GITHUB_PN="DSView"
-PYTHON_COMPAT=( python3_{11..12} )
+PYTHON_COMPAT=( python3_{11..13} )

 inherit cmake python-r1 udev xdg

--- a/www-client/firefox-developer-bin/Manifest
+++ b/www-client/firefox-developer-bin/Manifest
@@ -1,2 +0,0 @@
-DIST firefox-developer-bin-122.0-b9.tar.bz2 83948380 BLAKE2B 7eca48621141c05803bae04cb4c3cf69f188f3031216461616df6aba222853744e5326d71f1da29ec36955c4fff7c9296000eb42d36944ce6a74912a5c580e8c SHA512 ce5dfb5d0ba4ea418e339f5d4065fc9cd6c5b972ae17324c78c66452ece934dd818ea72743549403a8d1bcc4687b64c798ecdac55f9ecdbbcbd65b74781d1adf
-DIST firefox-developer-bin-128.0-b6.tar.bz2 87138236 BLAKE2B 86684531054c82c7493ac6f272e72e4089bb297f580c06f61c6a8abf19a9017bc473d5d38f4d71fc4a9912cf24f8758779b6e5362471eb0210c7e56a79ea6454 SHA512 daa68b6b2a07507d0f6bccd9cee287d4fdccd20f11d156cd0f168dc0f139c2a68fc88659576f2aeec258e1608fd7ed981363950848e6f9fb3d0374f6bad65d38
--- a/www-client/firefox-developer-bin/firefox-developer-bin-122.0.ebuild
+++ b/www-client/firefox-developer-bin/firefox-developer-bin-122.0.ebuild
@@ -1,46 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-REVISION=b9
-
-inherit desktop xdg
-
-DESCRIPTION="Firefox browser developer edition"
-HOMEPAGE="https://www.mozilla.org/en-US/firefox/developer/"
-SRC_URI="https://download-installer.cdn.mozilla.net/pub/devedition/releases/${PV}${REVISION}/linux-x86_64/en-US/firefox-${PV}${REVISION}.tar.bz2
-	-> ${P}-${REVISION}.tar.bz2"
-S="${WORKDIR}"
-
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-SLOT="0/developer"
-KEYWORDS="-* ~amd64"
-RESTRICT="strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	>=dev-libs/glib-2.26:2
-	>=media-libs/freetype-2.4.10
-	>=x11-libs/pango-1.22.0
-	media-libs/fontconfig
-	sys-apps/dbus
-	x11-libs/gtk+:3
-"
-
-QA_PREBUILT=".*"
-
-src_prepare() {
-	default
-
-	cd firefox || die
-	rm updater || die
-}
-
-src_install() {
-	dodir "/opt/${PN}"
-	cp -r firefox/. "${ED}/opt/${PN}" || die
-
-	dosym -r "/opt/${PN}/firefox-developer-bin" "/usr/bin/${PN}"
-	make_desktop_entry "${PN}" "Firefox Developer" "${PN}" "Network;WebBrowser"
-}
--- a/www-client/firefox-developer-bin/firefox-developer-bin-128.0.ebuild
+++ b/www-client/firefox-developer-bin/firefox-developer-bin-128.0.ebuild
@@ -1,46 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-REVISION=b6
-
-inherit desktop xdg
-
-DESCRIPTION="Firefox browser developer edition"
-HOMEPAGE="https://www.mozilla.org/en-US/firefox/developer/"
-SRC_URI="https://download-installer.cdn.mozilla.net/pub/devedition/releases/${PV}${REVISION}/linux-x86_64/en-US/firefox-${PV}${REVISION}.tar.bz2
-	-> ${P}-${REVISION}.tar.bz2"
-S="${WORKDIR}"
-
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-SLOT="0/developer"
-KEYWORDS="~amd64"
-RESTRICT="strip"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	>=dev-libs/glib-2.26:2
-	>=media-libs/freetype-2.4.10
-	>=x11-libs/pango-1.22.0
-	media-libs/fontconfig
-	sys-apps/dbus
-	x11-libs/gtk+:3
-"
-
-QA_PREBUILT=".*"
-
-src_prepare() {
-	default
-
-	cd firefox || die
-	rm updater || die
-}
-
-src_install() {
-	dodir "/opt/${PN}"
-	cp -r firefox/. "${ED}/opt/${PN}" || die
-
-	dosym -r "/opt/${PN}/firefox-bin" "/usr/bin/${PN}"
-	make_desktop_entry "${PN}" "Firefox Developer" "${PN}" "Network;WebBrowser"
-}
--- a/www-client/firefox-developer-bin/metadata.xml
+++ b/www-client/firefox-developer-bin/metadata.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
				`@@ -0,0 +1 @@`
				`DIST lsprotocol-2023.0.1.gh.tar.gz 249558 BLAKE2B 721746afd7f2b639ff008e589388d592b190d2ac7073158018f6e88f015003ded1b9b5def86f10d76a2ffd98d65b4cb917776a5e423e197bd0a0885c3332bacc SHA512 e929125f259240feb757c55a62ca4ee021e9727884dc5b7465894aa5d5a3cf13235f9b863af862ae1f1c04f1eaa3de6356cf7abecc6efa1979facaecbfb45e64`
				`@@ -0,0 +1 @@`
				`move media-sound/TauonMusicBox media-sound/Tauon`