gentoo auto-resync : 02:01:2025 - 06:31:11

7 files changed, 159 insertions, 61 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a8e67503a8d6..00ae5c9d5d31 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index a54b56ab345c..bb20c1165810 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,3 +1,6 @@
+DIST Electrum-4.5.8.tar.gz 13752500 BLAKE2B e8995e98c90dde3ae758df7e2a959d33c91ddddba5c950e24b3ca2d216f3aaa06e2186db02240f739ac76778affcc952671e7bde3e6bf86ff0f2f9a820e60ac6 SHA512 ccf45dc5e3a615d446e0714ddaa9ef74b96829bdf9a5236e18efff5f014ca18c48502a375ec98c9bc170f1db69e846b7015ca715b9cac8d77afde9f1939bc403
+DIST Electrum-4.5.8.tar.gz.asc 2499 BLAKE2B a2cd9a2ab2b071bd5fea37bc9aa8a42bae68671d850d762753955bb43be562e25a4d3bdefcd3d7c1840e5e19e16237d7516a110d759733f73c0d66a67f9703f5 SHA512 f15a7b68fa2039f75d99729a34c207f31181afeb865db7cf5b27b68f9a7a4054e9d7ea46bda39fa3441cc6d1c798ae0c797dfdf1c178d2121ba2aff3b434d09a
 DIST electrum-4.5.8.gh.tar.gz 5896794 BLAKE2B a58a62adfdfe9d3f033033f9120e697cb2c2441076abfc7e914ad7185b9bbe63d81e2c305b80ab57cd0649274f9077f3c4ae59d6236a0bb23ad6838553186894 SHA512 0e7b15747fcce94ad60f068c013a5f6051402b049bb63493179768f6a4c6cb7b8d1b7b1750861afd89f7ed6a83313dee6d40022098ed2dbb9897fbf31e978350
-EBUILD electrum-4.5.8.ebuild 3023 BLAKE2B 28eaf990f6c4d927879b1d5fadde0d33e191cad96d470d900246ea5905f7a69b9433fc202e96d8b4e432e46b6dc66035862ccf7d5238659188ff78dc66fd8f43 SHA512 ff8093d2cef9d491adb76156e9c0ef04bcdde29f593a47981577ed03ca89c7a46d59c154ad729719d353b286b22c4876f02493ef002843ee9c950bf409d502ed
+EBUILD electrum-4.5.8-r1.ebuild 3028 BLAKE2B c453e14bfcdf554579e5f5b8f3605dc6fabf46baf75821d17ecde126e8d4612aebf6de337d0927a5636f4993193d4063f6718d090166cc6d00cf403f96cd27ad SHA512 5f39a21f767f4865f2c611bbdd086b57be500c072655355f2f87de8a9fb996d417cbd2af36d9d98314e1ba397457a7228b229fc0afe0fea73bd2b72856bff5aa
+EBUILD electrum-4.5.8-r2.ebuild 3280 BLAKE2B 3c623baeafd5f7e0df9f1357f926fa624e55531b1380fe13ea4a773866b2e4042234a001066de29701bf0727e53553cbcab6a2f6bfb539c30e15aec82dd2dfd2 SHA512 9fae62ffef2c92af083749d1a5319e0dfa1bbdfdb52b84e71d3b7939acab31707633b43e420549bf404cfc12d2fae1529315455257cd2ef07e41232320f30e9f
 MISC metadata.xml 505 BLAKE2B e1168203de116392acb4d5719a1cbb56385a8840bc87f21ac13b5150f550a493735124c58dc6132b0a483854696ba6eb825b991ecb1a843b7f158240c08ca4a4 SHA512 dc8a4cf8a8a411df4994a959fea44f971198c8099b1b24d6378d5a49c09e333a37f5f9ade36da17eb99fcd9bddcf63090f30045faef0e902d43cfac1548bd8c8
diff --git a/net-misc/electrum/electrum-4.5.8.ebuild b/net-misc/electrum/electrum-4.5.8-r1.ebuild
index 7a63e2d4f444..66b8a007568a 100644
--- a/net-misc/electrum/electrum-4.5.8.ebuild
+++ b/net-misc/electrum/electrum-4.5.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ REQUIRED_USE="|| ( cli ncurses qt5 )"
 
 RDEPEND="
 	${PYTHON_DEPS}
-	dev-libs/libsecp256k1
+	<dev-libs/libsecp256k1-0.6
 	>=dev-python/aiohttp-socks-0.8.4[${PYTHON_USEDEP}]
 	=dev-python/aiorpcx-0.23*[${PYTHON_USEDEP}]
 	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
diff --git a/net-misc/electrum/electrum-4.5.8-r2.ebuild b/net-misc/electrum/electrum-4.5.8-r2.ebuild
new file mode 100644
index 000000000000..e7eecb79c2c5
--- /dev/null
+++ b/net-misc/electrum/electrum-4.5.8-r2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit distutils-r1 verify-sig xdg-utils
+
+MY_P=${P^}
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="
+	https://electrum.org/
+	https://github.com/spesmilo/electrum/
+"
+SRC_URI="
+	https://download.electrum.org/${PV}/${MY_P}.tar.gz
+	verify-sig? (
+		https://download.electrum.org/${PV}/${MY_P}.tar.gz.asc
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	<dev-libs/libsecp256k1-0.6
+	>=dev-python/aiohttp-socks-0.8.4[${PYTHON_USEDEP}]
+	=dev-python/aiorpcx-0.23*[${PYTHON_USEDEP}]
+	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	dev-python/pbkdf2[${PYTHON_USEDEP}]
+	dev-python/pyperclip[${PYTHON_USEDEP}]
+	dev-python/pysocks[${PYTHON_USEDEP}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-3.20[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/pyqt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+BDEPEND="
+	test? (
+		dev-python/pyaes[${PYTHON_USEDEP}]
+		dev-python/pycryptodome[${PYTHON_USEDEP}]
+	)
+	verify-sig? (
+		sec-keys/openpgp-keys-electrum
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# test for qml/PyQt6 GUI that doesn't work anyway
+	tests/test_qml_types.py
+)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/electrum.asc
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# remove bundled dependencies
+	rm -r packages || die
+
+	# use backwards-compatible cryptodome API
+	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
+
+	# make qdarkstyle dep optional
+	sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die
+
+	# remove upper bounds from deps
+	sed -i -e 's:,<[0-9.]*::' contrib/requirements/requirements.txt || die
+
+	local bestgui
+	if use qt5; then
+		bestgui=qt
+	elif use ncurses; then
+		bestgui=text
+	else
+		bestgui=stdio
+	fi
+	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
+
+	xdg_environment_reset
+}
+
+src_install() {
+	dodoc RELEASE-NOTES
+	distutils-r1_src_install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		ver_test "${v}" -ge 4.3.4 && return
+	done
+
+	ewarn "If you are new to BitCoin, please be aware that:"
+	ewarn "1. Cryptocurrencies are volatile.  BTC has been subject to rapid"
+	ewarn "   changes of value in the past."
+	ewarn "2. Cryptocurrency ownership is determined solely by the access to"
+	ewarn "   the private key.  If the key is lost or stolen, BTC are unrevocably"
+	ewarn "   lost."
+	ewarn "3. Proof-of-work based cryptocurrencies have negative environmental"
+	ewarn "   impact.  BTC mining is consuming huge amounts of electricity."
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/moonlight/Manifest b/net-misc/moonlight/Manifest
index 77299bd2b29c..741920d11ff4 100644
--- a/net-misc/moonlight/Manifest
+++ b/net-misc/moonlight/Manifest
@@ -1,4 +1,4 @@
 DIST MoonlightSrc-6.1.0.tar.gz 85936443 BLAKE2B 59c84c65555d261e977443eac826147e16c5d55a7a5fc0445e2c0bc7e7bab876bba1cde511923b241d405198120f3bd3db56f6a5092613a1c248f3de5d1412d6 SHA512 390fe3f686c86a52dd0ff4b67e8e8beb6edcb175ddf92bc5de11d92ffdaf0b6a8d76be781c483b685626c705e63f07e156506112923c848a4a798ba703254829
-EBUILD moonlight-6.1.0.ebuild 2048 BLAKE2B c7539d56dc9c2e9dc90e8ebaac42924e1418ab723ab483b57b29988b72af509d2d502fce4d9fc5064b7be2c7212ad89ef76cdc985bb3787c338609728cf404ce SHA512 1cf0d8f49e2cfc5e5ca7320f984a26f2ccc38888dd08cc5a357fa09f5fc6db2ff0a12a85068fd1e9602795bcc3512f60f2c2dd7dabf729bdcc0fecc952261b91
-EBUILD moonlight-9999.ebuild 2048 BLAKE2B c7539d56dc9c2e9dc90e8ebaac42924e1418ab723ab483b57b29988b72af509d2d502fce4d9fc5064b7be2c7212ad89ef76cdc985bb3787c338609728cf404ce SHA512 1cf0d8f49e2cfc5e5ca7320f984a26f2ccc38888dd08cc5a357fa09f5fc6db2ff0a12a85068fd1e9602795bcc3512f60f2c2dd7dabf729bdcc0fecc952261b91
+EBUILD moonlight-6.1.0-r1.ebuild 1836 BLAKE2B f5ec7acd76bf1236e9e8c43a17104290de63624ab292477894c494f113bd3636a4afc0d9833b8f43c2e5fc1d3eddfbdcee803178f05a173c7cc7ec39c1ccc936 SHA512 2837d9b88d6c42b4917a93c6984266756a588f59f5ce9b3f5662d7317a60bd871fb0cf16adea0564b7996e57f7b96186b093a543d1af817b9c1176db75afb3f1
+EBUILD moonlight-9999.ebuild 1836 BLAKE2B f5ec7acd76bf1236e9e8c43a17104290de63624ab292477894c494f113bd3636a4afc0d9833b8f43c2e5fc1d3eddfbdcee803178f05a173c7cc7ec39c1ccc936 SHA512 2837d9b88d6c42b4917a93c6984266756a588f59f5ce9b3f5662d7317a60bd871fb0cf16adea0564b7996e57f7b96186b093a543d1af817b9c1176db75afb3f1
 MISC metadata.xml 984 BLAKE2B e0894e0a7d256ed0b7ae86afa2be129a5be4536dbdb528a257747796ed790e1f3e712271ccec913ca21b95f7bff1429985a875738e1559365a78a652722916b6 SHA512 5f8110f46ce0a076451af9c99e0050a27dce2be2aced829561b7ff1ef2b5cb5a9e84b530d8f22b96a65097182a123b3da44db0e67cacf3f3c033814d4a3dc1b3
diff --git a/net-misc/moonlight/moonlight-6.1.0.ebuild b/net-misc/moonlight/moonlight-6.1.0-r1.ebuild
index ba12f846840c..bd201d280709 100644
--- a/net-misc/moonlight/moonlight-6.1.0.ebuild
+++ b/net-misc/moonlight/moonlight-6.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-if [[ ${PV} = 9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/moonlight-stream/moonlight-qt.git"
 	EGIT_SUBMODULES=( '*' -libs -soundio/libsoundio )
 	inherit git-r3
@@ -17,31 +17,22 @@ inherit qmake-utils xdg
 
 DESCRIPTION="NVIDIA GameStream (and Sunshine) client"
 HOMEPAGE="https://github.com/moonlight-stream/moonlight-qt"
+
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cuda +libdrm embedded glslow qt6 soundio +vaapi vdpau vkslow wayland X"
+IUSE="cuda +libdrm embedded glslow soundio +vaapi vdpau vkslow wayland X"
 
 RDEPEND="
 	dev-libs/openssl:=
+	dev-qt/qtbase:6[gui,network]
+	dev-qt/qtdeclarative:6[svg]
 	media-libs/libglvnd
 	media-libs/libplacebo:=
-	media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video]
+	media-libs/libsdl2[gles2,haptic,joystick,kms,sound,video]
 	media-libs/opus
 	media-libs/sdl2-ttf
-	media-video/ffmpeg:=[cuda?,libdrm?]
+	>=media-video/ffmpeg-6:=[cuda?,libdrm?]
 	libdrm? ( x11-libs/libdrm )
-	qt6? (
-		dev-qt/qtbase:6[gui,network]
-		dev-qt/qtdeclarative:6[svg]
-	)
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
 	soundio? ( media-libs/libsoundio:= )
 	vaapi? ( media-libs/libva:=[wayland?,X?] )
 	vdpau? (
@@ -51,13 +42,9 @@ RDEPEND="
 	wayland? ( dev-libs/wayland )
 	X? ( x11-libs/libX11 )
 "
-
-DEPEND="
-	${RDEPEND}
-"
-
+DEPEND="${RDEPEND}"
 BDEPEND="
-	dev-qt/qtcore
+	dev-qt/qtbase:6
 	virtual/pkgconfig
 "
 
@@ -86,11 +73,7 @@ src_configure() {
 		"
 	)
 
-	if use qt6; then
-		eqmake6 "${qmake_args[@]//$'\n'}"
-	else
-		eqmake5 "${qmake_args[@]//$'\n'}"
-	fi
+	eqmake6 "${qmake_args[@]//$'\n'}"
 }
 
 src_install() {
diff --git a/net-misc/moonlight/moonlight-9999.ebuild b/net-misc/moonlight/moonlight-9999.ebuild
index ba12f846840c..bd201d280709 100644
--- a/net-misc/moonlight/moonlight-9999.ebuild
+++ b/net-misc/moonlight/moonlight-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-if [[ ${PV} = 9999* ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/moonlight-stream/moonlight-qt.git"
 	EGIT_SUBMODULES=( '*' -libs -soundio/libsoundio )
 	inherit git-r3
@@ -17,31 +17,22 @@ inherit qmake-utils xdg
 
 DESCRIPTION="NVIDIA GameStream (and Sunshine) client"
 HOMEPAGE="https://github.com/moonlight-stream/moonlight-qt"
+
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="cuda +libdrm embedded glslow qt6 soundio +vaapi vdpau vkslow wayland X"
+IUSE="cuda +libdrm embedded glslow soundio +vaapi vdpau vkslow wayland X"
 
 RDEPEND="
 	dev-libs/openssl:=
+	dev-qt/qtbase:6[gui,network]
+	dev-qt/qtdeclarative:6[svg]
 	media-libs/libglvnd
 	media-libs/libplacebo:=
-	media-libs/libsdl2[gles2,haptic,kms,joystick,sound,video]
+	media-libs/libsdl2[gles2,haptic,joystick,kms,sound,video]
 	media-libs/opus
 	media-libs/sdl2-ttf
-	media-video/ffmpeg:=[cuda?,libdrm?]
+	>=media-video/ffmpeg-6:=[cuda?,libdrm?]
 	libdrm? ( x11-libs/libdrm )
-	qt6? (
-		dev-qt/qtbase:6[gui,network]
-		dev-qt/qtdeclarative:6[svg]
-	)
-	!qt6? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-	)
 	soundio? ( media-libs/libsoundio:= )
 	vaapi? ( media-libs/libva:=[wayland?,X?] )
 	vdpau? (
@@ -51,13 +42,9 @@ RDEPEND="
 	wayland? ( dev-libs/wayland )
 	X? ( x11-libs/libX11 )
 "
-
-DEPEND="
-	${RDEPEND}
-"
-
+DEPEND="${RDEPEND}"
 BDEPEND="
-	dev-qt/qtcore
+	dev-qt/qtbase:6
 	virtual/pkgconfig
 "
 
@@ -86,11 +73,7 @@ src_configure() {
 		"
 	)
 
-	if use qt6; then
-		eqmake6 "${qmake_args[@]//$'\n'}"
-	else
-		eqmake5 "${qmake_args[@]//$'\n'}"
-	fi
+	eqmake6 "${qmake_args[@]//$'\n'}"
 }
 
 src_install() {