gentoo auto-resync : 27:08:2022 - 02:53:16

5 files changed, 161 insertions, 2 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index efb6cbbcb7f4..6926ae790939 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/electron-cash/Manifest b/net-misc/electron-cash/Manifest
index 48708b43f39f..a22299a5d9f8 100644
--- a/net-misc/electron-cash/Manifest
+++ b/net-misc/electron-cash/Manifest
@@ -1,6 +1,8 @@
 AUX 3.3.6-no-user-root.patch 1261 BLAKE2B 6035a47b73ce13a92ef66177d6131f5744a498bb4360aa289aca6a09c6ef3e7b663914590f4c9be635078fed0bc82ae706f0cb4c7280acab88bbb1f5211d6473 SHA512 bed6b2108b3a8c8960b43eff854b8292d5e6fbd0fdd8383e43e020cac51767cbd70a1c371a3dffe1bc51145f97f930cb966fd4eee1ecc3ca021cbcfac0ea1a81
 DIST electron-cash-4.2.10.tar.gz 8023055 BLAKE2B e79c000f4278c323a8f14aa8d960c25c2971a8c5736e31a6f18f4b5faae11a8ff5339de3193e191c21373075bd6472570770d14262c9b5d41e3eca2b91e633d3 SHA512 f90a11f6a5d79024f982f8ab148c9c079049114bcb0c405da9f54b62620afbda462e074abde01bed7fa12d0090a842e393e24e66ff74031a87f0c79f6323895a
+DIST electron-cash-4.2.11.tar.gz 8039918 BLAKE2B 3139647fd22aaa88ff9a514b83e12dd3b36abb6affe9b51b270e1936f4d37ec3ea867ebcfe388f428392093996d2bf7d1268ee0b2447c5d559a39c3e35745dfc SHA512 7b01d2d94b29a3f054738cd89344a7c15136f90d6aa66dd587da315471aeb053bee1d7bbeab46016054b7dd98915bb2225a381d082a8fd137997c05957e2d44a
 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.11.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.2.11.ebuild b/net-misc/electron-cash/electron-cash-4.2.11.ebuild
new file mode 100644
index 000000000000..fc56ca7c306e
--- /dev/null
+++ b/net-misc/electron-cash/electron-cash-4.2.11.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+MY_P="Electron-Cash-${PV}"
+DESCRIPTION="Lightweight Bitcoin Cash client (BCH fork of Electrum)"
+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 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 )
+	amodem? ( qt5 )
+	cosign? ( qt5 )
+	digitalbitbox? ( qt5 )
+	email? ( qt5 )
+	qrcode? ( qt5 )
+	sync? ( qt5 )
+	vkb? ( qt5 )
+"
+
+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}]
+	dev-python/qrcode[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	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}]
+	)
+	ncurses? ( dev-lang/python )
+	dev-libs/libsecp256k1
+"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/3.3.6-no-user-root.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons/d' setup.py || die
+
+	if use qt5; then
+		pyrcc5 icons.qrc -o electroncash_gui/qt/icons_rc.py || die
+	else
+		sed "s|'electroncash_gui.qt',||" -i setup.py || die
+	fi
+
+	local wordlist=
+	for wordlist in  \
+		$(usex l10n_ja '' japanese) \
+		$(usex l10n_pt '' portuguese) \
+		$(usex l10n_es '' spanish) \
+		$(usex l10n_zh-CN '' chinese_simplified) \
+	; do
+		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)  \
+		$(usex qt5      '' qt   )  \
+		$(usex ncurses  '' text )  \
+	; do
+		rm electroncash_gui/"${gui}"* -r || die
+	done
+
+	# And install requested ones...
+	for gui in  \
+		$(usex qt5      qt   '')  \
+	; do
+		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+	done
+
+	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.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}" || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex amodem          '' audio_modem          ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex sync            '' labels               ) \
+		trezor  \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r electroncash_plugins/"${plugin}"* || die
+		sed -i "/${plugin}/d" setup.py || die
+	done
+
+	eapply_user
+
+	distutils-r1_src_prepare
+}
+
+src_install() {
+	doicon -s 128 icons/${PN}.png
+	distutils-r1_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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/openssh/Manifest b/net-misc/openssh/Manifest
index 211fc509c90a..d4707f83812f 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -35,5 +35,5 @@ DIST openssh-9.0p1.tar.gz 1822183 BLAKE2B 49724a400951964d659d136908657940f79e15
 DIST openssh-9.0p1.tar.gz.asc 833 BLAKE2B e29ff08f10feee7347c02a7ce4b33b8d9c71a26656f0430a2511c25bc6b5006f1683d845826a68ff4eed068b30c911e273cb34e5b4880854d55a776415474019 SHA512 7b1445764058435d2fa8a9c7553643983650d4232036c088e46e44beeb538d32cba88f775b1be9da5f21a01d6caea59b3dc4714507781e9cb946546fa54f169f
 EBUILD openssh-8.9_p1-r2.ebuild 17076 BLAKE2B 6f236af760da98ff31643f2bf22560c65d7fc0b00a00502b84657739039663e230b78db2a0cc3cc02eea6fc3f030157bc22053955501ecaa055698eea5a70bca SHA512 4d2d05fc3a15318687d769c99b779bdc41998a5456650b7d174828e4d557711036d2def92f7f8465c9c4e38180e614f12462e58ca7e0653d7be7e242e4408bb5
 EBUILD openssh-9.0_p1-r1.ebuild 16937 BLAKE2B 34b2fa4021a8f55c017af579bac3e07f20debc330450c56b0fe562bcf8822397fd527902fc5bed3f9f2a7c687ab96d67a33ce29a894eea641db154301d15e505 SHA512 de3849679d4440d2e2d69b68c2c2d5d01bf240aff3868dcae1d53b120468098f3dedebcefc826b0898ea8fcea61107a177e6c1df6f5ba54e600e2f41ae67d772
-EBUILD openssh-9.0_p1-r2.ebuild 16930 BLAKE2B e70e6264ea67180f1e195d9a05ccc5be8d8b42890fe4d4eb1ec4eab0dbe689447f4c2ef09193b2b765860290e1324f903c94df8f118922fa44a1657bb0cf32f6 SHA512 ff3e42ecf3c774516cfee346cb9cddfad1e71935e7d5a1a9817f9dc0410767c40e5b146f6dc5503dfc197401196cf6df69a6e71ba51358d080305d4827bf099c
+EBUILD openssh-9.0_p1-r2.ebuild 16929 BLAKE2B a218c0faba8bb8218841f2c621584bd7b381629a12620e27f54cb5c563fcd1d56a21b2f10be20b77c7492eb2d89be31c209fc250252be86cb88d427642123ebe SHA512 d7a865cbf8bd64fd4518966b43a4af8f3156cd125cb6b91a4d9a63ba1c02625155bd641f082056d753c5f84172c2965e3fc5e5376a6d68b72edf651c8f7b5d55
 MISC metadata.xml 2047 BLAKE2B 87356343744e121075383ad94ba6b821d2db5c3f5af16745130078f939e53b6a83281c19b89f272d20509753bc734bfdd3aab024d72651c7d5c69df27b36841a SHA512 a5b69ff7fa94b00062e78eba36b6d321fd923d27e953fc24ae81d8e25040bebde9ccb8b1555912726eff2b39ee0256aee0da52359e326fb4b1edd394e4f1e406
diff --git a/net-misc/openssh/openssh-9.0_p1-r2.ebuild b/net-misc/openssh/openssh-9.0_p1-r2.ebuild
index 75e9c1d0ecc3..decc6b4c0401 100644
--- a/net-misc/openssh/openssh-9.0_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-9.0_p1-r2.ebuild
@@ -38,7 +38,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug hpn kerberos ldns libedit livecd pam +pie sctp security-key selinux +ssl static test X X509 xmss"