7 files changed, 8 insertions, 102 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 293001fee611..c7a6bd03b3c1 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index d684da9017c8..2e602cc6100b 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,5 +1,3 @@
-DIST electrum-4.3.1.gh.tar.gz 5444509 BLAKE2B 68d63b730396c229bcb09262740a7d3ef322fce7fd16265d352e3eb2039e123d043307036d906b1688cc43d33620cf1b8f7aaa03ac9f5d68e5f9a2b84e6d44a7 SHA512 038b7c643ed11fe14e368be91bc09e5f043d4ae86cdf0ad0d80861ffa47aececcc4b0bec5a8596a8d78590b859bf302ed99d2d57bab1a2a053677fc7fa190e06
 DIST electrum-4.3.2.gh.tar.gz 5460546 BLAKE2B b2367116aef2a2a76dca30a635188bcd99f0fdd46ce6e8c5a2d6608fbb8f0a58e88b8352c5db92b7c8709f7bbc420fc1860204aca1efc2f2c4be2c788bfa1909 SHA512 dfb137e01ca6e511fb5ac70c34dcb01f36bdb209d7d290bd53c8fa5f95783f346898478d6e58435b241928dfe05ff46455e2e587520d47892c66b3198ab89c82
-EBUILD electrum-4.3.1.ebuild 2196 BLAKE2B c888d43cf12b8723bf03844916a42b69f6ab380207eea5aed148390c42f5391492e1a76e88e09efe380d9a434a5d4bd23f0df15d4b942b96c59590dd0be5522b SHA512 54630ab974a3696f2566f8c36911364e6079e0e499ec073b4bc3d3bbc488b0bc3d37a438639e71613279025b02e3ae917e527bd81423b2b33028236ec6f3d86d
-EBUILD electrum-4.3.2.ebuild 2198 BLAKE2B 34cf18c28a2ddb2d4226d16ac5b8ca44ecd077b5a7dd6dcf89ea546f44aa017388178e0a5a38f8ff729068f84a527a30b9cfa2c50833ee9854f910aa4b090c9c SHA512 c2721f46753db1758580b872f1fbe66d9da93bdf70e8c80ffbe6ffae42881c989dff9e7a8ade8b8a9193ce0b8b6eb56e5322fc6a8234c669002df9fc812eac27
-MISC metadata.xml 668 BLAKE2B b57807d75d1d31c191ecb43c4ed0bb7c598ed8bf82f8c00552299b15dc47942340777a60bd216aae6d2abbaab74952a8e17ba9db8dd5f6b857ed96d49556cb38 SHA512 6177da58a0be608c51f6b457785d91ff918636d9377ad81af0ad9dcfa7291526b6fa1f3c7a049d233951bd7b37d62215884c8fa20372c7220e490c6e161db625
+EBUILD electrum-4.3.2.ebuild 2196 BLAKE2B c888d43cf12b8723bf03844916a42b69f6ab380207eea5aed148390c42f5391492e1a76e88e09efe380d9a434a5d4bd23f0df15d4b942b96c59590dd0be5522b SHA512 54630ab974a3696f2566f8c36911364e6079e0e499ec073b4bc3d3bbc488b0bc3d37a438639e71613279025b02e3ae917e527bd81423b2b33028236ec6f3d86d
+MISC metadata.xml 750 BLAKE2B 1e63e09759e679c5fb2f9a04c56e420085ec8d4531b92f0af0bfe999b9df5e2e4dd1b860428c0077214a32514c695f4aa46bfffa4f424db6736524629d84443f SHA512 d9422a8f176816e728c394a201bf8049ac8e9c45a1012e0fc26fcb03d7a6aa26e48255f3278120cac50d05554dc09182d86dcfa1a4e8b8955dde87c117395a46
diff --git a/net-misc/electrum/electrum-4.3.1.ebuild b/net-misc/electrum/electrum-4.3.1.ebuild
deleted file mode 100644
index 719d71694cf4..000000000000
--- a/net-misc/electrum/electrum-4.3.1.ebuild
+++ /dev/null
@@ -1,95 +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..10} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="
-	https://electrum.org/
-	https://github.com/spesmilo/electrum/
-"
-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() {
-	# 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
-
-	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() {
-	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.3.2.ebuild b/net-misc/electrum/electrum-4.3.2.ebuild
index 52e7834f1a47..719d71694cf4 100644
--- a/net-misc/electrum/electrum-4.3.2.ebuild
+++ b/net-misc/electrum/electrum-4.3.2.ebuild
@@ -21,7 +21,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/metadata.xml b/net-misc/electrum/metadata.xml
index 8f2706737ba4..b37bf7b5c7ab 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -18,4 +18,7 @@
 		<flag name="cli">Enables the CLI interface</flag>
 		<flag name="qrcode">Enable QR code scanning with <pkg>media-gfx/zbar</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="github">spesmilo/electrum</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 25496a51085b..26cec56cdd8d 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -5,5 +5,5 @@ DIST minidlna-1.3.2.tar.gz 736820 BLAKE2B e35266be94e4585f399c80a6909318ce973d44
 DIST minidlna-1_3_1.tar.gz 299749 BLAKE2B 0c4e5b5dc8b4fb14609cc71eafb008dfab0ef81350ac5c7f1a83e65f54b1d87296b3f0a063dbda3bd642fc777c36a0f839d5426c03ae852b07827a2b7d38c765 SHA512 6e94f33070db04660b83285a13942173537866ab53f9375e3162131fd86948349991a6c60cb2800c46546d73e58222a008d4cee1914c826f3a2f450f1c95a0e5
 DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e
 EBUILD minidlna-1.3.1-r1.ebuild 2186 BLAKE2B 53a912b649cbb3b3994f14caee663d9784f237352e078ff60a9e1d22e26d8bcae7df515b95b8e8de58d7452aeba326ac8674c19c6b3bfc7f08c710e731d48ddb SHA512 b89bf10730c2a774bec2367fbe720205442706477c8b78945b4cee111148ca8985e1cbb5725f1c367782207f2aec277f102e3a15b77f7ee7f5f302e33ada6cbe
-EBUILD minidlna-1.3.2-r1.ebuild 2076 BLAKE2B f1dd0a6fb4a4985d77e0948803b6d2bd6e194bda97d6ed0b63648035190f57d72f22a8d7f92c676e39aadaf3d6003d5c4555572a5196094f7ae48406680ddaaf SHA512 553560806a9ae9d26d87a586ac23c35f85956b842a122f12be0a1cb906963451d4a9e1a4986270df971cc9b51924b12c57926a3a0f5063811cf20c98e3ddec69
+EBUILD minidlna-1.3.2-r1.ebuild 2074 BLAKE2B 942ebc1e64b87b56c44d163f038d9ec7312d509ce3d0116d7b053388d2c3f6f33dc7509aa0b543950cc022fb694d4b5b32567470eed420324e86487a7cd76fde SHA512 5470ef4929104c17fcb68e6ca4a8e6cd560485a72a2e01eee24d2d0af3a8b5feefe2f0dda22b9fb6aaa7ca8881cee04847bd87423d1caff03dd5b78cd9c53e73
 MISC metadata.xml 513 BLAKE2B 6e851975b83efd7972d5d58c85093a36bf0f51845cb6ef1f7d7b37dab65dd913a5bbd6e5f163b2142eee11d6860b55e1bd346e23b5f4f427ca0812701149eede SHA512 99fe90016717a048a38feec908049f5f0c7b81045dc9e8953b204eb22e858f74b876fd5ae3765cbf88204f9f6ece87310dccb2123bdb1cc007e3c9049967a4e1
diff --git a/net-misc/minidlna/minidlna-1.3.2-r1.ebuild b/net-misc/minidlna/minidlna-1.3.2-r1.ebuild
index 8f4526c40645..3e02635f1f99 100644
--- a/net-misc/minidlna/minidlna-1.3.2-r1.ebuild
+++ b/net-misc/minidlna/minidlna-1.3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~x86"
 IUSE="netgear readynas zeroconf"
 
 DEPEND="