gentoo resync : 12.05.2022

5 files changed, 10 insertions, 225 deletions

diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index daa759a96d80..e56c2e0aa119 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,9 +1,4 @@
 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
-AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
-DIST electrum-4.1.5.gh.tar.gz 4998188 BLAKE2B c33f1a8fa2af68370319a4f4fefe4d1814a20870114f4929d53bf90eca6bbb555cf9e52681f329d18dec32642ee21ee0e32558ec817936291296ce8e196c8fb1 SHA512 9430dfde6d6e78bb71db416cd35f474b44e234d69421b370dc7e4b09584ad86e095051dcf1366c142d5e6c3029aca617b4fb383f50904fc43d2f7f99053b1c92
-DIST electrum-4.2.0.gh.tar.gz 5065087 BLAKE2B 800667f2661ef45fae7e7f2d73229810eb490e90a9bea7ff84c04c3cf859f07ac71972658a52f802817a42de7eeb0084c6b0e1aba74733918f250228996f0641 SHA512 72c8afcd2f3fc3de2b8b6516dc82355718c7dc9a88b06ba91d8e3a3d1e2bf329c02cfc8ea9dc22aff88fbde622dd443606f14e11e0bf8050da5765cd9be75a83
 DIST electrum-4.2.1.gh.tar.gz 5066728 BLAKE2B 66b1ef4ec21f74f2f5c25de97a31c2ec23f907526df2ac661fdcb563e1e857ca88f4f534f2373e809ba978c66b78af72260af27944ac7aa8a92e86531827fef6 SHA512 b32ee5f8779bdb9bcda6a163f3f0a4cd95e91efb37418734c9f08930221ad15e54868fca0d5d0fb1dd3b1fac91b8cdea6c6ec822d98ad6b3d6ee01c841972e88
-EBUILD electrum-4.1.5.ebuild 2427 BLAKE2B b3f6b497dc1598fffda1d3a33cde9ccaac99a7b1a1eb91a8fa8cdf4e4da102626bb1b4d0895ce9d72857204405432ef11b8a80d46022028e622517e058786513 SHA512 ffa7139cb2eb713a4fe637ff741f4823f52527fcd0524d88f8288dbd669760f8472ae12779e4d593d4300c2e1d6f5a30a83e82d990d0085b9d74279618f38b7d
-EBUILD electrum-4.2.0.ebuild 2250 BLAKE2B c7609f6232a501975c536bccc6e5f71261690763d8df18b02ec469b10122f0cb0692247c643f1cb3d70e64cc4f5b71238b79edc152890e87df761309d2a77a80 SHA512 7e8c3165cbe29bf5ab8f80eef0817b49035cf49954011e939ae5abfdbcacb863bc855749429662ae91de8b95f603ae4c222e703c5ebd1ac926c1455f20f03116
-EBUILD electrum-4.2.1.ebuild 2250 BLAKE2B c7609f6232a501975c536bccc6e5f71261690763d8df18b02ec469b10122f0cb0692247c643f1cb3d70e64cc4f5b71238b79edc152890e87df761309d2a77a80 SHA512 7e8c3165cbe29bf5ab8f80eef0817b49035cf49954011e939ae5abfdbcacb863bc855749429662ae91de8b95f603ae4c222e703c5ebd1ac926c1455f20f03116
+EBUILD electrum-4.2.1-r1.ebuild 2307 BLAKE2B 48de95d56ee10861da40806431c10441ed3c364d251d762d5b81e316e2b70973886ff4f0621ff21976f45b04bb6c75514bd4c45da63ca243bca81d96528ede2f SHA512 b9071f5f882617cf8ba5667abbf658374548bd3a702a677b00bccd840de08cb305516a5496b71ab27260585dcfef02afe6a94e74814ae87eac66e2b99418721e
 MISC metadata.xml 668 BLAKE2B b57807d75d1d31c191ecb43c4ed0bb7c598ed8bf82f8c00552299b15dc47942340777a60bd216aae6d2abbaab74952a8e17ba9db8dd5f6b857ed96d49556cb38 SHA512 6177da58a0be608c51f6b457785d91ff918636d9377ad81af0ad9dcfa7291526b6fa1f3c7a049d233951bd7b37d62215884c8fa20372c7220e490c6e161db625
diff --git a/net-misc/electrum/electrum-4.1.5.ebuild b/net-misc/electrum/electrum-4.1.5.ebuild
deleted file mode 100644
index 1efda47c7185..000000000000
--- a/net-misc/electrum/electrum-4.1.5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.19*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${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-python-3.12[${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}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.3.2-desktop.patch"
-
-	# unbind aiorpcX dep
-	sed -e '/aiorpcx/s:,<0.19::' \
-		-i contrib/requirements/requirements.txt || die
-	sed -e '/aiorpcx/s:raise.*:pass:' \
-		-i run_electrum || die
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || 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
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.2.0.ebuild b/net-misc/electrum/electrum-4.2.1-r1.ebuild
index 02786de94c6c..7811b4d896ad 100644
--- a/net-misc/electrum/electrum-4.2.0.ebuild
+++ b/net-misc/electrum/electrum-4.2.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="ncurses?"
 
 inherit desktop distutils-r1 xdg-utils
@@ -13,15 +13,17 @@ DESCRIPTION="User friendly Bitcoin client"
 HOMEPAGE="https://electrum.org/"
 SRC_URI="
 	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
+		-> ${P}.gh.tar.gz
+"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cli ncurses qrcode +qt5"
 REQUIRED_USE="|| ( cli ncurses qt5 )"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
+	${PYTHON_DEPS}
 	dev-libs/libsecp256k1
 	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
 	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
@@ -54,8 +56,8 @@ distutils_enable_tests pytest
 src_prepare() {
 	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
 
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
+	# Prevent data files from being installed in the wrong location
+	sed -i -e '/icons_dirname/d' -e '/applications/d' setup.py || die
 
 	# use backwards-compatible cryptodome API
 	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
@@ -78,6 +80,7 @@ src_prepare() {
 
 src_install() {
 	doicon -s 128 electrum/gui/icons/${PN}.png
+	domenu electrum.desktop
 	dodoc RELEASE-NOTES
 	distutils-r1_src_install
 }
diff --git a/net-misc/electrum/electrum-4.2.1.ebuild b/net-misc/electrum/electrum-4.2.1.ebuild
deleted file mode 100644
index 02786de94c6c..000000000000
--- a/net-misc/electrum/electrum-4.2.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${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-python-3.12[${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}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons_dirname/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || 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
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/files/3.3.2-desktop.patch b/net-misc/electrum/files/3.3.2-desktop.patch
deleted file mode 100644
index e932623be246..000000000000
--- a/net-misc/electrum/files/3.3.2-desktop.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur Electrum-3.3.2.orig/electrum.desktop Electrum-3.3.2/electrum.desktop
---- Electrum-3.3.2.orig/electrum.desktop	2000-11-11 06:11:11.000000000 -0500
-+++ Electrum-3.3.2/electrum.desktop	2019-01-08 20:47:55.628978706 -0500
-@@ -3,7 +3,7 @@
- 
- [Desktop Entry]
- Comment=Lightweight Bitcoin Client
--Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"
-+Exec=electrum %u
- GenericName[en_US]=Bitcoin Wallet
- GenericName=Bitcoin Wallet
- Icon=electrum
-@@ -14,8 +14,3 @@
- Terminal=false
- Type=Application
- MimeType=x-scheme-handler/bitcoin;
--Actions=Testnet;
--
--[Desktop Action Testnet]
--Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"
--Name=Testnet mode