gentoo resync : 02.08.2019

7 files changed, 188 insertions, 22 deletions

diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index c8edcdb6d633..9793aa81d987 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -6,7 +6,10 @@ AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa15
 DIST Electrum-3.1.3.tar.gz 2806178 BLAKE2B e03a6ee8d7b211b26d99adfbaf42a9d43317e5a4ca887f62f5ef0e57d8f990c18ff07e15d4ac8faea33322cd7ae25d7544e59e9ff1fbe883b3b7be138d990421 SHA512 745d00ec944e46040a4ae21d23c5919b943696a85baf84ee553616ca73cd21f2fa95999212a23f9a96ad5606def2890ee057e5f5f18e82591fd4a9e497ba5439
 DIST Electrum-3.3.4.tar.gz 8606286 BLAKE2B a815a577509cc7d31f02347b5ce52d0fe9fd52ddbe4b60200a02423f8e6bf43a6c24d3c1db6ab265a69f6f3891db63886fe6c138d601bc48c0c8fdb66191e941 SHA512 297eb757dccb166d40a652be2c1c058e42f16416b586b69f32223966ff1e92a34e5d01822d71bd063bfa72b7bbbcae4251a63f7373600d0eeb139e923d17a2b3
 DIST Electrum-3.3.6.tar.gz 8789792 BLAKE2B dcac9a317364780a7dc3ae1083e6ba7fd3a4559d0b7f6375197bdf639143ab9da2c5a001605af5a0590fb900de2e98999aea171c6dcec390a47beb610af3b490 SHA512 b25fc67883b7a90bf902f62d07574f283c4c04b3c6dfbb4e890448ddb938d477e036470f82b45e426aa581a1da2425e13e6974a730b18b130fd265b8d01d0d91
-EBUILD electrum-3.1.3.ebuild 4324 BLAKE2B 982bf508f73e8dba14667d04e49c3af84e04c2c84624bfae7698ce265d3b09246db987e1da9e8887266c1d77e0a575104d489de97719ddf71cd3d390f359768a SHA512 8620a4eb41aedc875f3315fad410489b96d9ffbf1477cd91d6ca34385c12719e4fefb56eb9a5d1700d5c99001340a080af96fd3ddfffa3970bd9ff311934c39b
-EBUILD electrum-3.3.4.ebuild 4642 BLAKE2B 02a2f998591557da446f1d9be0db24742764ddb3e22af518460281fde6f6cd8ce1ab0308aaae9f4d6247705e5aa05c21ec7067d7ca8548cf8461da47445b9706 SHA512 770bc4dff7fee5bf2508ab2c58f346f0bdb767fde0d26d8de61ede13b617b96a2d7cf8859925acaf84270dfd00cfe8811adb455519717e35b31f03be4ca48048
-EBUILD electrum-3.3.6.ebuild 4650 BLAKE2B bb191b6005932f5964bc3d8ecf69ab5fd67e1a1751bdbb064731a300fb8ca5b9c70ffbaa3cdbf6973e9bdce6e5e1e04d47cab46f2b47fa5c55646db3c23958e1 SHA512 e0273dab1f9a63e1be93619fa69b5256895ec712d72cab27c45a22be4fc8602f9a087e9176edc7e6c0b957e7a7154e3baa64fc4a8e79b8d535a1bd0d63811d92
-MISC metadata.xml 1464 BLAKE2B 702ecb52f960766ab9cfbf48af6bdec84ffe6374bc0bc7684aefd47aa36b569c2730205bd6bca9ebfbee168abf5478d263be5724e99c896c3a296d85bf3d2075 SHA512 e6142f8a9bb951a6dae009c542597ab47ef2398b8c119824e8e14575f02de2d776b3463035973e2da5f90d896417f00c3fe8533e2894e162e262def472531f02
+DIST Electrum-3.3.8.tar.gz 8911228 BLAKE2B af24f44f5805a5722d0b9500776ae1ea4f70e0869045535ea3bf27d24a61013ba718230e6292061581f55a4fae655cbacae9024a321efe655eb9816bae11ae75 SHA512 5f756da4d2df59c69997925c69f651011def07bfbdbc582f492ecc19386eee7d79b9951732a792e6041da902d776052d6590cbd2d7004bc93c8406bcf9093fe6
+EBUILD electrum-3.1.3-r1.ebuild 4320 BLAKE2B 84d8e4688ac9d9cd5a79aa46f8ba7e52e710dc4e7aa5c6148d01de506e460ca84f6fb9ba6344afc8c276fe60c2c6f5cb143fb61a0908067a15c976ea875bae25 SHA512 778f32e95f0de35aa98b1c82a77264c3fc623c6f03d3c0494ae0da880dd533ad9e9660a5b448326de95c89920996b4b209e920416e11e6958d117fcb66dd0614
+EBUILD electrum-3.3.4.ebuild 4638 BLAKE2B 6c7e2c95d7be76e496d49aea1e2b6ac691c2b72336f155cda5643824ccdb51ee27f7c5c8a15d90fc1d464de0e8e504ffe0efbe1c3c652101efc611bf3fa520ab SHA512 60c252dbb9ac4c8f2f31713c1c4ff7086c6c62193fc59f000ab4a0e7b7ea7523b30587bf78318d80e950d28fd07574f414211e0b126cf0ecb8fc97aaab8d4ee3
+EBUILD electrum-3.3.6-r2.ebuild 4483 BLAKE2B e091135eb705c26e15822a0368d8523464ca973e4822c531c1ac7c1f023b97c365808a685610239add5b6365c4e8ea13664e2451c6f23a4e85be8128bfd9dc5d SHA512 1a2ef4689c4e786e20a56f288778ea6eef9557cdbc4955ca029782cfa67951b0eef8bc1cf9528b60cf23c5a1a9cd802c36f19ed001545deb93a05d1f5624b77d
+EBUILD electrum-3.3.6-r3.ebuild 1985 BLAKE2B 0c7ce770601e51f7acd6486ace1b16391db55837f37bec1efccc5ce9790afa5ef5cf6a4262c3b0775cd5dda6de9f335d44c8e16e27109dff74a59416219955e1 SHA512 e01f79da37cf2050992a21e4ed5c215c2d2bd7cc4074f50e70293fe6c174f0c34816ac2758d7bf2b3554d6fb5c76d779b2cf8b359320d8a1439565455a8ff14c
+EBUILD electrum-3.3.8.ebuild 1984 BLAKE2B 7b21baafee7ecd511fb62cf5966b094b24d1c7ae6bc22d160301c168ce9ad68a539f38f18574f01b7b079d60d102ea6e99feab200e21f361824e2ae697722f8c SHA512 3186355d2502da16753b69d0ad9481b92c9c330ec20dc3199f6be00ec0710eb1a492e114c546418cbf84a855cc67e280fb4069b95373242a13f55db380db1c8f
+MISC metadata.xml 1572 BLAKE2B 4681012dbca54a822c32dcbb5eab12718294c138343ac2469426678a85647dedc892a14e2287d0aaf2291e9d9b029796a29f32f6ae82ac6b56d7a9acb49295f3 SHA512 83bedb1cbb9c5260c7260b7e83c2105742c0403ceafae9857b4491abfd070ec3248f918d3a11bb7c93973714fb46af3864bdd85075d075bfb94f2ec6b9aca82b
diff --git a/net-misc/electrum/electrum-3.1.3.ebuild b/net-misc/electrum/electrum-3.1.3-r1.ebuild
index 93c690ce8a8d..25eee433cc44 100644
--- a/net-misc/electrum/electrum-3.1.3.ebuild
+++ b/net-misc/electrum/electrum-3.1.3-r1.ebuild
@@ -47,6 +47,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="${PYTHON_DEPS}
+	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -58,7 +59,6 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tlslite[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
diff --git a/net-misc/electrum/electrum-3.3.4.ebuild b/net-misc/electrum/electrum-3.3.4.ebuild
index 55e1c6c8c06e..72ad9942454a 100644
--- a/net-misc/electrum/electrum-3.3.4.ebuild
+++ b/net-misc/electrum/electrum-3.3.4.ebuild
@@ -49,6 +49,7 @@ REQUIRED_USE="
 RDEPEND="${PYTHON_DEPS}
 	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
 	dev-python/aiorpcX[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -60,7 +61,6 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/tlslite[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
diff --git a/net-misc/electrum/electrum-3.3.6.ebuild b/net-misc/electrum/electrum-3.3.6-r2.ebuild
index b664a9d69b27..a66c1036b967 100644
--- a/net-misc/electrum/electrum-3.3.6.ebuild
+++ b/net-misc/electrum/electrum-3.3.6-r2.ebuild
@@ -3,10 +3,10 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="ncurses?"
 
-inherit desktop distutils-r1 gnome2-utils xdg-utils
+inherit desktop distutils-r1 xdg-utils
 
 MY_P="Electrum-${PV}"
 DESCRIPTION="User friendly Bitcoin client"
@@ -15,7 +15,7 @@ SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 MY_LANGS="ar_SA be_BY bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI sv_SE ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
 
 my_langs_to_l10n() {
@@ -48,7 +48,8 @@ REQUIRED_USE="
 
 RDEPEND="${PYTHON_DEPS}
 	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.17.0[${PYTHON_USEDEP}]
+	~dev-python/aiorpcX-0.17.0[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	dev-python/jsonrpclib[${PYTHON_USEDEP}]
 	dev-python/pbkdf2[${PYTHON_USEDEP}]
@@ -58,9 +59,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
 	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	virtual/python-dnspython[${PYTHON_USEDEP}]
 	qrcode? ( media-gfx/zbar[v4l] )
 	qt5? (
 		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
@@ -111,13 +110,11 @@ src_prepare() {
 
 	# And install requested ones...
 	for gui in  \
-		$(usex qt5      qt   '')  \
+		$(usex !qt5     qt   '')  \
 	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
+		sed -i -e "/electrum\.gui\.${gui}/d" setup.py || die
 	done
 
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
 	local bestgui
 	if use qt5; then
 		bestgui=qt
@@ -163,16 +160,12 @@ src_install() {
 	distutils-r1_src_install
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 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/electrum/electrum-3.3.6-r3.ebuild b/net-misc/electrum/electrum-3.3.6-r3.ebuild
new file mode 100644
index 000000000000..06e13125923f
--- /dev/null
+++ b/net-misc/electrum/electrum-3.3.6-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
+	~dev-python/aiorpcX-0.17.0[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${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}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+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
+
+	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-3.3.8.ebuild b/net-misc/electrum/electrum-3.3.8.ebuild
new file mode 100644
index 000000000000..3a3dda96aa67
--- /dev/null
+++ b/net-misc/electrum/electrum-3.3.8.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 xdg-utils
+
+MY_P="Electrum-${PV}"
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli ncurses qrcode +qt5"
+
+REQUIRED_USE="|| ( cli ncurses qt5 )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/aiohttp-socks[${PYTHON_USEDEP}]
+	=dev-python/aiorpcX-0.18*[${PYTHON_USEDEP}]
+	dev-python/dnspython[${PYTHON_USEDEP}]
+	dev-python/ecdsa[${PYTHON_USEDEP}]
+	dev-python/jsonrpclib[${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}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( $(python_gen_impl_dep 'ncurses') )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+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
+
+	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/metadata.xml b/net-misc/electrum/metadata.xml
index b3234f5ca5c7..4f3345beaed9 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>