gentoo resync : 04.05.2021

4 files changed, 4 insertions, 98 deletions

diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 34c4a00d3204..33882f4735b7 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -4,9 +4,8 @@ DIST electrum-4.0.9.gh.tar.gz 4435268 BLAKE2B e1dfe319f7b4beffd039164c97d247f5d2
 DIST electrum-4.1.0.gh.tar.gz 4539032 BLAKE2B 72ef52a000799e496e6ccca152dc8bec827aef23d4e3290fd2e86ace0f96e9267f68b56c390b873658dc8f6e6998080bd0283494ee74603c360dfe250b64c282 SHA512 7dd94bfc23f78e915f42f1043f6b7e9d0d6d5de7303418da8d2f3bd53ece794c74c3cd0dd9d77b370a6c6f049261273b170ddcb67f6c3dc7189869b200e8d437
 DIST electrum-4.1.1.gh.tar.gz 4539619 BLAKE2B abcb0713b8b82fb7b13b432146ee63746690cf3a80d3951de41a13435eba7217010c92653d5263ea155072e5bb911e38f6c3d6a83f72bda9fb07a26f705e2621 SHA512 f3066171bc8cef1402356f01254acdce3e4f4d6fb99a1feb52d76f3a7c21f5b082148b7b598b19ae8a4817b221b8d80f27f9ab67d3d09e465856d51f8b28f0e4
 DIST electrum-4.1.2.gh.tar.gz 4926068 BLAKE2B e5d543c963cfec523e80e2de8b6a44c1845bdee23524c182e86efb7ff41caeaccebbefab2b8dda9c1e027410809d42be30db6dbc20fd877f3c749619478a6977 SHA512 4db8f8061ae149a5d9770b8c30676aa85ee66eb71052763e29d551317484b597628aad702370486b466c981688488f5a4592ae30a426e5fcd9250bc1a69a890a
-EBUILD electrum-4.0.9-r1.ebuild 2260 BLAKE2B e3e444bedf6174076d32d72e79328500045d0ae51a1d4b4beb939a4260e876eaec449d7a5ac4eda90ffb339530130e9ecf9932f166b0e7b91bc4de58ffae9f41 SHA512 eff401fec30e5ffa40659fef0e15665211bc09324ff4d3ff0677a3c019d19871b49a54fbe72f4c05d449660e27fcdf9bdc51ec745451d429b72cc644dad65216
-EBUILD electrum-4.0.9-r2.ebuild 2361 BLAKE2B 3dda3366438c3192f0578d40b32f3036d5c7b2a13dd239e757628210b7e7d01989cb1a88894e2c08d084335924bf6d0c7e706899aca6df1645cbf80cbfd86be5 SHA512 9cc89c2e87adb47178af80e50e3af504b4c8412b000ed03807d19301f9cce28ab3e5f1b8d1baea5c2b7f1371ccaf685e760bc1aa2f4f7affe24c24b2c0eb21c9
+EBUILD electrum-4.0.9-r2.ebuild 2360 BLAKE2B 9c94a59d7a4359f2f92a4d7d807c43b6c1802f3755f9909355ee288bce08c5dc76a40e47ffc3df3186d7321cc62653ac79d7e69d4ff1b71841365574b70d5ace SHA512 7eb3066ea7bae08650f3e124b57df9b2e355fd621369cd54a29e028bfb20df99fc6c5fa921c8c42f08cdb115efd3858cf0fcf7c02ae38f59c30b4776b5483b7d
 EBUILD electrum-4.1.0.ebuild 2362 BLAKE2B 84a60036ec950f752b64524b811978dd5c55eb09502946eaa290411e8bff057d6c45f7a1fbb947019008e9f5b50b65731658a54aaf952c567c59c6873673dbda SHA512 02b33eeb034a52d310f68fda91327ed13272c7ec2dd7933e381889857b4c3844f50227b384bdc79f1ec09de321aa5b7f928844665711e641515956cfe5459e84
 EBUILD electrum-4.1.1.ebuild 2362 BLAKE2B 84a60036ec950f752b64524b811978dd5c55eb09502946eaa290411e8bff057d6c45f7a1fbb947019008e9f5b50b65731658a54aaf952c567c59c6873673dbda SHA512 02b33eeb034a52d310f68fda91327ed13272c7ec2dd7933e381889857b4c3844f50227b384bdc79f1ec09de321aa5b7f928844665711e641515956cfe5459e84
-EBUILD electrum-4.1.2-r1.ebuild 2424 BLAKE2B f35f538b95491c45d7b6bdb5d58d5181bb714eb117d091fdbe95aa3b9a8e06eab69d0b58f0ae8fafc200a337a5ee746145125aa259176a14c0b2e2c99bdbfc67 SHA512 664f9f74a51ec3879d5b5df878d195d932402398ca767fd9f7f8f8f315fc123784c256a35ca9eb8a55756df1d3c652f686a9ad561697c6b1c533d7b6568908a6
+EBUILD electrum-4.1.2-r1.ebuild 2429 BLAKE2B 776cf7736027c4c4469a43abefd667ebdc3de053b5ef7f33b7a6b7e8fa864ee6bf1ec9418302a7ef8e33d223dd93103841591dc6ee626e8213aa242432b44a1f SHA512 9ea0993e5f6b4197d75e770748ee4fcaa69f3cb2ae7445d5d5237873c8730defa5f07806e1d7ff99976a38973d02a3f4cbbd68ff50be0fcd2b130a9e8da6c0ed
 MISC metadata.xml 667 BLAKE2B 4532c27bf060a5d6708cd7cbd350a30765778cf197221c6c0a4ce3d6db04f22b57f2c2836010fffb26f2b165b4df4e07652bb64addda4c9c982b80810c064d71 SHA512 ac74b8fab1cc0ca770d0f07b422cdf46af8a845ce49e00bb7b8eb5135b68408482689210025f6be087c997e9154e0d7366b1361d31e22653b872f5638abcea56
diff --git a/net-misc/electrum/electrum-4.0.9-r1.ebuild b/net-misc/electrum/electrum-4.0.9-r1.ebuild
deleted file mode 100644
index 7e148205d9f7..000000000000
--- a/net-misc/electrum/electrum-4.0.9-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7..8} )
-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.18*[${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"
-
-	# 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.0.9-r2.ebuild b/net-misc/electrum/electrum-4.0.9-r2.ebuild
index 2a512c321f6f..c0432d8aaefd 100644
--- a/net-misc/electrum/electrum-4.0.9-r2.ebuild
+++ b/net-misc/electrum/electrum-4.0.9-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="cli ncurses qrcode +qt5"
 REQUIRED_USE="|| ( cli ncurses qt5 )"
 
diff --git a/net-misc/electrum/electrum-4.1.2-r1.ebuild b/net-misc/electrum/electrum-4.1.2-r1.ebuild
index 8299571facec..a8c551d5f9bb 100644
--- a/net-misc/electrum/electrum-4.1.2-r1.ebuild
+++ b/net-misc/electrum/electrum-4.1.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8..9} )
 PYTHON_REQ_USE="ncurses?"
 
 inherit desktop distutils-r1 xdg-utils