gentoo resync : 29.12.2022

4 files changed, 36 insertions, 32 deletions

diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest
index ef217e626435..48708b43f39f 100644
--- a/net-misc/electron-cash/Manifest
+++ b/net-misc/electron-cash/Manifest
@@ -1,6 +1,6 @@
 AUX 3.3.6-no-user-root.patch 1261 BLAKE2B 6035a47b73ce13a92ef66177d6131f5744a498bb4360aa289aca6a09c6ef3e7b663914590f4c9be635078fed0bc82ae706f0cb4c7280acab88bbb1f5211d6473 SHA512 bed6b2108b3a8c8960b43eff854b8292d5e6fbd0fdd8383e43e020cac51767cbd70a1c371a3dffe1bc51145f97f930cb966fd4eee1ecc3ca021cbcfac0ea1a81
-DIST electron-cash-4.0.2.tar.gz 8967992 BLAKE2B 081546d148dbc7da5e192154818831e125437c00093e1fe434ef0a67f8c06ceb1d2b1f44de9e71aac5786f995aeffd8fb6b74c64f6aa249f5cc9c06c9a276845 SHA512 dad17906f1dc2e53d4c6bff15a38d3276d16377f71b4d4e260b7b667f2b045da49f504483606d4515cdf71300b67108301b6cce971d1cca16c3856023b3e3f3a
-DIST electron-cash-4.2.3.tar.gz 7593885 BLAKE2B 902e1b93958b2796e2679327e81c9c5637f57ac1a840291b30a515bcd8c2b12724dfa075e38f1265eebc2a734bc715ddcbd98eaf13903d99b78fa3dd4f704d03 SHA512 0917d67501bb29dc49be25d7845a892c42f08718e7ff0560c27e34a6ba093acfd7ccf15cd1f5d09b03ff01b41c8d9cce84a9968388fae3d52f6a13f1cfb01a0a
-EBUILD electron-cash-4.0.2-r2.ebuild 3564 BLAKE2B 922e116a1440bd2b72322ba900a12ad85475f21fb3642be289a8d99ed7729f1f7b170ce58deeac28c2e0e67335cf8185f1306522f2ddb9db988eb8a3fad0d54a SHA512 1f174b1905d2a3032121a91fde9236a023f23857e7207ebf37bc5609ab600b6668afaa763448723da732230bb730013ef1d00e3b2f537c41a469b2e867522ed1
-EBUILD electron-cash-4.2.3.ebuild 3710 BLAKE2B 63aec594af519818245353d8496fa6a78d80ee26e1389c80993b071b89f04d66e558806c2feb2701e4b4047c810b2517d3b5239543b95620878b08d076c71f67 SHA512 baad7f7adf8f8679699184a2ec0735f1eb058298b7ee88dae8d1432fa3de19bfdcf52494a2f5cbd9659c46aaeb5302aa9cc481f7d0be4fce83f1164f1bdfd4c8
-MISC metadata.xml 1033 BLAKE2B 3457a56219654744e1b6af665d602a889a32d760b324d4a95484c48d55fb30f898b3ef33f99a5d056225a146f7ddc1c95dacd02779bdf5379e518ddb34f66918 SHA512 ac10c1d89a6deb3c8107aab8d4c538d008c7f4b325fe0b5e28c96b3f7fd5cbc7c4b699530996b9a41236516b79eb03caa76b3ed3c4d6b61846041dd9b93ffc94
+DIST electron-cash-4.2.10.tar.gz 8023055 BLAKE2B e79c000f4278c323a8f14aa8d960c25c2971a8c5736e31a6f18f4b5faae11a8ff5339de3193e191c21373075bd6472570770d14262c9b5d41e3eca2b91e633d3 SHA512 f90a11f6a5d79024f982f8ab148c9c079049114bcb0c405da9f54b62620afbda462e074abde01bed7fa12d0090a842e393e24e66ff74031a87f0c79f6323895a
+DIST electron-cash-4.2.9.tar.gz 8023098 BLAKE2B 37a55e2161a8f7c2d9b11c1bc564d77ace84ad745be677bb41f07af2b8c18c223e6cf37c7df42dea170341f276babd8eda4bd9564e9069fc9623a059cc92f09b SHA512 e27dda4a4c8b81ad7b303652fdb2d893c3d53e76eb0f7e295753a7f92676c895ea8087e424a43bbb2d32db9a4f0e8c03b779cf9daf2ff8e51d4813a097ac9c6c
+EBUILD electron-cash-4.2.10.ebuild 3785 BLAKE2B 35214f7792a4dbfbfdaccb802a5e95b5479ca8a3dfec6763d49feeea0874267e87102b9258cd2fa3d087d31aa393a5df8bccee3a6f38ad64ae1984ab6d0b422d SHA512 9c2b44d48c6236a98457cfc90952a7ef1aecd444a3247076e590234bfbda5ee22f86981e213b1172657c01f3fb54bd99c32f38e3f983b5965a882f1112ca2c40
+EBUILD electron-cash-4.2.9.ebuild 3736 BLAKE2B 923872b101367b68dfcb37ff78150e7824d7e080b6985ea0821c65cc7bc430d6791dd4e916f98cf893f4277ed2c7b6b3182e67f6f2015bd464a532c6a7496ab2 SHA512 e103992e65ea1d1d6c188aecaa674264e208cdaf18dcec20216d407f4b9714efaa624c121008dc46bc8a602ac40945e90ae603f5a96abf740c234ef3dd5f7882
+MISC metadata.xml 981 BLAKE2B 10c823bd62005a00acf1e410e78a5e2917af126f1cc4c98608ab8277570c4defe53b3e282168189ac3c18634860a93b664c83cde1959553b0182069830c6f3a3 SHA512 30538ee18680bf39e49cc434977376b6bce2be717204781d2e17dffcdcfe4970a772834474511c12b94906d05f026882d3b6ffde8dd3992eb1030d3ee78c77d6
diff --git a/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild b/net-misc/electron-cash/electron-cash-4.2.10.ebuild
index 35dac74afdd3..fc56ca7c306e 100644
--- a/net-misc/electron-cash/electron-cash-4.0.2-r2.ebuild
+++ b/net-misc/electron-cash/electron-cash-4.2.10.ebuild
@@ -1,28 +1,29 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 PYTHON_REQ_USE="ncurses?"
 
-inherit desktop distutils-r1 gnome2-utils xdg-utils
+inherit desktop distutils-r1 xdg-utils
 
 MY_P="Electron-Cash-${PV}"
 DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
-HOMEPAGE="https://github.com/fyookball/electrum/"
-SRC_URI="https://github.com/fyookball/electrum/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/Electron-Cash/Electron-Cash"
+SRC_URI="https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
+IUSE="amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
 	l10n_es l10n_ja l10n_pt l10n_zh-CN"
+RESTRICT+=" test"
 
 REQUIRED_USE="
 	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
+	amodem? ( qt5 )
 	cosign? ( qt5 )
 	digitalbitbox? ( qt5 )
 	email? ( qt5 )
@@ -35,6 +36,7 @@ RDEPEND="
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pathvalidate[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
 	dev-python/pyaes[${PYTHON_USEDEP}]
 	dev-python/PySocks[${PYTHON_USEDEP}]
@@ -43,6 +45,8 @@ RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	net-libs/stem[${PYTHON_USEDEP}]
+	amodem? ( dev-python/amodem[${PYTHON_USEDEP}] )
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
@@ -51,6 +55,8 @@ RDEPEND="
 	dev-libs/libsecp256k1
 "
 
+distutils_enable_tests pytest
+
 S="${WORKDIR}/${MY_P}"
 
 DOCS="RELEASE-NOTES"
@@ -62,7 +68,7 @@ src_prepare() {
 	sed -i '/icons/d' setup.py || die
 
 	if use qt5; then
-		pyrcc5 icons.qrc -o gui/qt/icons_rc.py || die
+		pyrcc5 icons.qrc -o electroncash_gui/qt/icons_rc.py || die
 	else
 		sed "s|'electroncash_gui.qt',||" -i setup.py || die
 	fi
@@ -74,19 +80,18 @@ src_prepare() {
 		$(usex l10n_es '' spanish) \
 		$(usex l10n_zh-CN '' chinese_simplified) \
 	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
+		rm -f "electroncash/wordlist/${wordlist}.txt" || die
+		sed -i "/${wordlist}\\.txt/d" electroncash/mnemonic.py || die
 	done
 
 	# Remove unrequested GUI implementations:
 	local gui setup_py_gui
 	for gui in  \
 		$(usex cli      '' stdio)  \
-		kivy \
 		$(usex qt5      '' qt   )  \
 		$(usex ncurses  '' text )  \
 	; do
-		rm gui/"${gui}"* -r || die
+		rm electroncash_gui/"${gui}"* -r || die
 	done
 
 	# And install requested ones...
@@ -112,7 +117,7 @@ src_prepare() {
 	# trezor requires python trezorlib module
 	# keepkey requires trezor
 	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
+		$(usex amodem          '' audio_modem          ) \
 		$(usex cosign          '' cosigner_pool        ) \
 		$(usex digitalbitbox   '' digitalbitbox        ) \
 		$(usex email           '' email_requests       ) \
@@ -123,7 +128,7 @@ src_prepare() {
 		trezor  \
 		$(usex vkb             '' virtualkeyboard      ) \
 	; do
-		rm -r plugins/"${plugin}"* || die
+		rm -r electroncash_plugins/"${plugin}"* || die
 		sed -i "/${plugin}/d" setup.py || die
 	done
 
@@ -142,11 +147,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/net-misc/electron-cash/electron-cash-4.2.3.ebuild b/net-misc/electron-cash/electron-cash-4.2.9.ebuild
index 2bd6c9e8666a..ab269027a1f4 100644
--- a/net-misc/electron-cash/electron-cash-4.2.3.ebuild
+++ b/net-misc/electron-cash/electron-cash-4.2.9.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 PYTHON_REQ_USE="ncurses?"
 
-inherit desktop distutils-r1 gnome2-utils xdg-utils
+inherit desktop distutils-r1 xdg-utils
 
 MY_P="Electron-Cash-${PV}"
 DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
-HOMEPAGE="https://github.com/fyookball/electrum/"
-SRC_URI="https://github.com/fyookball/electrum/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/Electron-Cash/Electron-Cash"
+SRC_URI="https://github.com/Electron-Cash/Electron-Cash/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="amodem audio_modem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
+IUSE="amodem cli cosign digitalbitbox email ncurses qrcode +qt5 sync vkb
 	l10n_es l10n_ja l10n_pt l10n_zh-CN"
 
 REQUIRED_USE="
-	!audio_modem
 	|| ( cli ncurses qt5 )
 	amodem? ( qt5 )
 	cosign? ( qt5 )
@@ -36,6 +35,7 @@ RDEPEND="
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
+	dev-python/pathvalidate[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
 	dev-python/pyaes[${PYTHON_USEDEP}]
 	dev-python/PySocks[${PYTHON_USEDEP}]
@@ -144,11 +144,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/net-misc/electron-cash/metadata.xml b/net-misc/electron-cash/metadata.xml
index 1b7e4b952e85..213f5fe41bbc 100644
--- a/net-misc/electron-cash/metadata.xml
+++ b/net-misc/electron-cash/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="cli">Enables the CLI interface</flag>
 		<flag name="amodem">Enable plugin to support Audio Modem</flag>
-		<flag name="audio_modem">Deprecated name for amodem</flag>
 		<flag name="cosign">Enable plugin to support multisig wallets between multiple Electrum clients</flag>
 		<flag name="digitalbitbox">Enable plugin to support Digital Bitbox hardware wallet</flag>
 		<flag name="email">Enable plugin to support emailing invoices</flag>
@@ -17,6 +16,6 @@
 		<flag name="vkb">Enable plugin for virtual keyboard</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">fyookball/electrum</remote-id>
+		<remote-id type="github">Electron-Cash/Electron-Cash</remote-id>
 	</upstream>
 </pkgmetadata>