Merge updates from master

7 files changed, 157 insertions, 32 deletions

diff --git a/dev-python/flask-compress/Manifest b/dev-python/flask-compress/Manifest
index cbd912fea98b..227c5733accc 100644
--- a/dev-python/flask-compress/Manifest
+++ b/dev-python/flask-compress/Manifest
@@ -1,2 +1,2 @@
-DIST Flask-Compress-1.10.0.tar.gz 12271 BLAKE2B e120dc8f28a686e01d9e8d949d765cd7d05d11322195027ad499a514a4f1d35d79e28627d79abe6279d53ff95d3fe0f43f3561868904ec9ff903925046c5c141 SHA512 6166b4ac303f4fa373615d44e44b628448548e55591f1fe4eea8085f4f441fffe82e9d1419444f31581975fb49ed9ed5c32e594bc97e386e97df9a898f40b469
+DIST Flask-Compress-1.10.1.tar.gz 12272 BLAKE2B 857319ea7fabece977429a810706314bc6a7984f2fb4c2ac3ed604fee0494fa60d45ab00a253bf4a3e9394d399f20f23d806744676597b2064bfbbd6f7b11c46 SHA512 fb94aef71f59e38a6058f5ef799c8973d258cf624b1d8bf0a991cac2e4eabb73e2836ce351faa73bc7640720396183212a6dc8d72428b53ceb3473f7b61f0d27
 DIST Flask-Compress-1.9.0.tar.gz 10322 BLAKE2B 4dddfd8a5c4c182a0cb3c5f346ccca611517ab6471dd23512c885e3e370ac09f9a099994afd2ee28eae47cca6cba2d49220d8733103e6cdcfbae03b98a2480f1 SHA512 5f13f20a3a2f8e646a4324cf75a419ea5111252db701a17dd37bbafdb9228d0e279a6c957c5cfd69468bbdffb435e37a50e0dcf5d1a160f7397df1e6a9e6ac9e
diff --git a/dev-python/flask-compress/files/flask-compress-1.10.0-test-install.patch b/dev-python/flask-compress/files/flask-compress-1.10.0-test-install.patch
deleted file mode 100644
index c104a71caa78..000000000000
--- a/dev-python/flask-compress/files/flask-compress-1.10.0-test-install.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c82a993548494ee13035ca77aeaf0726218bee0d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 15 Jun 2021 23:25:03 +0200
-Subject: [PATCH] Do not install top-level "tests" package
-
-Fixes a regression in af2f16335279044e8baeab42e0b182d3e05861b4 that
-causes "tests" to be installed as a top-level package to site-packages.
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index b4aef13..afbe57a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -13,7 +13,7 @@ setup(
-     description='Compress responses in your Flask app with gzip, deflate or brotli.',
-     long_description=LONG_DESCRIPTION,
-     long_description_content_type='text/markdown',
--    packages=find_packages(),
-+    packages=find_packages(exclude=['tests']),
-     zip_safe=False,
-     include_package_data=True,
-     platforms='any',
--- 
-2.32.0
-
diff --git a/dev-python/flask-compress/flask-compress-1.10.0.ebuild b/dev-python/flask-compress/flask-compress-1.10.1.ebuild
index 082df471fdf6..a3ed51356ad1 100644
--- a/dev-python/flask-compress/flask-compress-1.10.0.ebuild
+++ b/dev-python/flask-compress/flask-compress-1.10.1.ebuild
@@ -25,7 +25,3 @@ RDEPEND="
 "
 
 distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test-install.patch
-)
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 2dbb4f384476..7a6b63da6385 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1 +1,2 @@
 DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880ab71267dacd4747444bc767711ccd6c2f54d9e10ce5ad8fae0c3206fb4b6199f267e9bbaf12eb654227f59c2b0 SHA512 1e1d5d8755c6d1a153d84210bf29902afafe853659d709e13abc6bc5772def13779d2394690af1c544384c9c607edc0fe5cf2763244fb346febf9a9e0032b45f
+DIST psycopg2-2.9.tar.gz 379805 BLAKE2B 4e34b9dc28d0922ae9e9f75dd734b961915a032eba0c4b5ea9c4fe82bff4d5d230b37b0efdb25b8423177fdd7e98e69d0ed6ae0eccd731dca212845966b9c0ac SHA512 9787d0d3bb163815a452139bc3fbde93c767431b3e31c77dd534b6a476d1c09a51e2503b0420ac7a3753ef7fa64c13e2643f4bf4aeaeb60f15ea4eefc3538bfa
diff --git a/dev-python/psycopg/psycopg-2.9.ebuild b/dev-python/psycopg/psycopg-2.9.ebuild
new file mode 100644
index 000000000000..7a7e34f73507
--- /dev/null
+++ b/dev-python/psycopg/psycopg-2.9.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="${PN}2"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PostgreSQL database adapter for Python"
+HOMEPAGE="https://www.psycopg.org https://pypi.org/project/psycopg2/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="debug test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-db/postgresql-8.1:*"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? ( >=dev-db/postgresql-8.1[server] )"
+
+python_prepare_all() {
+	if use debug; then
+		sed -i 's/^\(define=\)/\1PSYCOPG_DEBUG,/' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	initdb -D "${T}"/pgsql || die
+	# TODO: random port
+	pg_ctl -w -D "${T}"/pgsql start \
+		-o "-h '' -k '${T}'" || die
+	createdb -h "${T}" psycopg2_test || die
+
+	local -x PSYCOPG2_TESTDB_HOST="${T}"
+	distutils-r1_src_test
+
+	pg_ctl -w -D "${T}"/pgsql stop || die
+}
+
+python_test() {
+	"${EPYTHON}" -c "
+import tests
+tests.unittest.main(defaultTest='tests.test_suite')
+" --verbose || die "Tests fail with ${EPYTHON}"
+}
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 70294e196ab3..df71e72cf8b4 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1 +1,2 @@
 DIST electrum-4.1.2.gh.tar.gz 4926068 BLAKE2B e5d543c963cfec523e80e2de8b6a44c1845bdee23524c182e86efb7ff41caeaccebbefab2b8dda9c1e027410809d42be30db6dbc20fd877f3c749619478a6977 SHA512 4db8f8061ae149a5d9770b8c30676aa85ee66eb71052763e29d551317484b597628aad702370486b466c981688488f5a4592ae30a426e5fcd9250bc1a69a890a
+DIST electrum-4.1.3.gh.tar.gz 4958955 BLAKE2B 0d338261ada16d5f1a9b01532fd976094ed7105204f45997c789c01c757d85e7d8a47d20935f848a7e52db1755f953d999e974500cb016f34088642f046c6637 SHA512 af74cfd5ef3f5bc8a788a55b3459029fec7a08b693a3e58133b74a5ad782d4a716061e8619bef633fcfee8a9d1989980c1e8e8e314cea2431e473745660e773e
diff --git a/net-misc/electrum/electrum-4.1.3.ebuild b/net-misc/electrum/electrum-4.1.3.ebuild
new file mode 100644
index 000000000000..a8c551d5f9bb
--- /dev/null
+++ b/net-misc/electrum/electrum-4.1.3.ebuild
@@ -0,0 +1,99 @@
+# 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
+}