gentoo resync : 02.04.2018

5 files changed, 231 insertions, 0 deletions

diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 17eb22635af5..6d4d67a2fc03 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,9 +1,14 @@
 AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
 AUX 3.1.1-pip-optional-pkgs.patch 473 BLAKE2B 35784d786735b277b9efd906c35f6dc843971c948590fd00f875591208076429860f7cc1c4dacfd54a78cc64daa13c071857f6745b9da3154fd72f8abcfa5b12 SHA512 6c90bd44f440a18a8b70c0f398d5e132164e1738524771b4e35bd5c80a0ec03b311f11afcb717a1bda6103fbabc6268f5fbeb987beeb9c3bd6a313745cb429c5
+AUX 3.1.2-desktop.patch 671 BLAKE2B 1be7fddfb50dccb1c4dbca8827e2a1198c926abba507c9bf593f43308e6976dddb390a5fdd74ebb9fe6df34cd806a4de7be698ad431d6abee9840ae82635b0ad SHA512 1b9040e8468279381ecd6331e98ad040f52297a7cef32586655c8ec30358e0590cdcbf6f5353b5b66e4a022ed00515a34dae45b42a80222ce0b977cb9dbdfbf7
+AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
+AUX 3.1.2-pip-optional-pkgs.patch 458 BLAKE2B 25f2ef7a37cb7e05fb0d4e9f70b6e4656d1423d940a1dcc8b6700d2fc67c221250a55f14fc5df99e2d6dede27c47223755e19e48ed776eb34432c8fd173a28a4 SHA512 ffe18ebfb67f6de8456e38228cbf864afce94a686ebc11ef866f4d9f0c324b3d96b8f3a315c13bd0efba0c62f6ee2af6f093005115be3cfb4d8a284d3a236b3f
 DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df8ca2e3204333e6edd7db98ecbeebdf81f4ac819de8b87c7593e83f948d091d48d55cdff08af76322d94bacec0fd SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39
 DIST Electrum-3.0.6.tar.gz 2640475 BLAKE2B 2e10417fb59629b9e3af8ba10893fb85b3b0d0ed9f7d7226a58dc7a2f91ed682423168092101565b00824bc62cae60d878de0d78271b716c027c8616419037a8 SHA512 4df9d81d954a008c3a14a89a7191b8af94393701b55651ad19acc75addb70fea942876a45c545c89b290cbdd7adb41b2d36e3cbcf73449eaa5d0a39e1529b2ef
 DIST Electrum-3.1.1.tar.gz 2722902 BLAKE2B 31628d18a26f552469454c4f2712eee1aaba6ff5114a7cf0b7f261def5ed5731a267ae369ec3460c7f9bb5ad2b1713b2b464ef05fadb5e0e9ffd563adeee0ce8 SHA512 d7f987dde4a4fe5b2b0e576328c20b56ca650047321ac101dc6c3edd5bcbeedd569870d951262583a5ef1d1e40d6107ac46aa4fe031cc63d3a759d332db056cb
+DIST Electrum-3.1.2.tar.gz 2800714 BLAKE2B 0932932125f1fd7099c090806c669a998c00a70a8f34b20d0afe4b1f6c5c24ced8743a60923e466c3507d29c75ac58e2e3e01b422701be76bbcd8abf54497276 SHA512 e4e6d674817bacefaf9c64acfdf16c4c215264e825dd8b1bcf1d99429963b0da18d442b966ba986cf0ad2d621543c3e0e68e8ba023cca23b6626781c2e69a61e
 EBUILD electrum-3.0.5.ebuild 4313 BLAKE2B 21a41f162be364235d5f4c57c0d55dc9c32df268877048d97985bdd565d3711708f503e59bdf6d38a5cdedbdd191c7c6e0cfeb5a89613155e770de84d3d92d0c SHA512 6ec934d1438b9853e05a7f011d672f02e6542176496c9f5965a188d20dfda409577abfcfef00cbf46bb95b9aeeece89fc9982de0508135d8b4891ca97e0aa7ad
 EBUILD electrum-3.0.6.ebuild 4280 BLAKE2B 994a3247356194c4cd81260c9c18768eb4401666ecaaafea617d4cace28607648ea1dc613b38b0c377d3c4e73087eb61144b9de24f4e7f515410178b08a243b9 SHA512 c4858d54e9acc243291a534af582da363dceed332ee719aa5167651ef21f5b2e9ddd13f23749b6608be1d2cb0df0233b8f1a6836eeacc2d6430c8209e359c9ec
 EBUILD electrum-3.1.1.ebuild 4321 BLAKE2B f1c45a4501ed148c2019ee94b6778886042158f02b021ae1958bc984ac133923c1c6f83ddd5392196df13180efad47364e876f9dcd1b96b1469c8068d27c868f SHA512 0105d9b8197e5597cb9861d673ca373aa450cd3fb80d4e471ff581e5f4e496e8ad754de54dc386a8c23c3c848e55d9715eeedbe8402d811eb99a127dbd2a0d16
+EBUILD electrum-3.1.2.ebuild 4363 BLAKE2B ab576cb5577e82e19a3d1cf78b010e3b6b90ebc6d6342527106700e53e18585413a8e2bedf6f188b2dfdfb7e318482e3f6ffbf6bf3c015993830b827605b305e SHA512 90e9be07d4a7ff40cf1a3df5b7a0fdf4547cbd0b42a2efb506e08581427beeeb21e1a18385f9a2a2d60e0adb0301161e302d5dc5709bfb8d18e0bbb4a091d45d
 MISC metadata.xml 1327 BLAKE2B d0029a93d9b105b621b2053498ff5c570e97e3945fb1c33252f85ab3110d06395b03d05b2625dc278ca8c36521762c74d52fcb9317055f9532e82c18168fb02e SHA512 3047791e1985494eeec1348c64e9a7ef6f9055cc01b0eb462dcb8958a6fb448d75ace206c33498cdd45a5470efc4091f5bc0bc062284a2bd2b0f4a6299591d09
diff --git a/net-misc/electrum/electrum-3.1.2.ebuild b/net-misc/electrum/electrum-3.1.2.ebuild
new file mode 100644
index 000000000000..a336ee7a3d3f
--- /dev/null
+++ b/net-misc/electrum/electrum-3.1.2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="ncurses?"
+
+inherit desktop distutils-r1 gnome2-utils 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"
+MY_LANGS="ar_SA 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 ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
+
+my_langs_to_l10n() {
+	# Map all except pt_* and zh_* to their generic codes
+	case $1 in
+		pt_*|zh_*) echo ${1/_/-} ;;
+		*) echo ${1%%_*} ;;
+	esac
+}
+
+IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
+
+for lang in ${MY_LANGS}; do
+	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
+done
+unset lang
+
+REQUIRED_USE="
+	|| ( cli ncurses qt5 )
+	audio_modem? ( qt5 )
+	cosign? ( qt5 )
+	digitalbitbox? ( qt5 )
+	email? ( qt5 )
+	greenaddress_it? ( qt5 )
+	qrcode? ( qt5 )
+	sync? ( qt5 )
+	trustedcoin_com? ( qt5 )
+	vkb? ( qt5 )
+"
+
+RDEPEND="${PYTHON_DEPS}
+	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/tlslite[${PYTHON_USEDEP}]
+	|| (
+		dev-python/protobuf-python[${PYTHON_USEDEP}]
+		dev-libs/protobuf[python,${PYTHON_USEDEP}]
+	)
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	qrcode? ( media-gfx/zbar[v4l] )
+	qt5? (
+		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
+	eapply "${FILESDIR}/3.1.2-pip-optional-pkgs.patch"
+	eapply "${FILESDIR}/3.1.2-desktop.patch"
+
+	# Prevent icon from being installed in the wrong location
+	sed -i '/icons/d' setup.py || die
+
+	# Remove unrequested localization files:
+	local lang
+	for lang in ${MY_LANGS}; do
+		use l10n_$(my_langs_to_l10n ${lang}) && continue
+		rm -r "lib/locale/${lang}" || die
+	done
+
+	local wordlist=
+	for wordlist in  \
+		$(usex l10n_ja    '' japanese) \
+		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
+		$(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
+	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
+	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/' electrum || die
+
+	local plugin
+	# trezor requires python trezorlib module
+	# keepkey requires trezor
+	for plugin in  \
+		$(usex audio_modem     '' audio_modem          ) \
+		$(usex cosign          '' cosigner_pool        ) \
+		$(usex digitalbitbox   '' digitalbitbox        ) \
+		$(usex email           '' email_requests       ) \
+		$(usex greenaddress_it '' greenaddress_instant ) \
+		hw_wallet \
+		ledger \
+		keepkey \
+		$(usex sync            '' labels               ) \
+		trezor  \
+		$(usex trustedcoin_com '' trustedcoin          ) \
+		$(usex vkb             '' virtualkeyboard      ) \
+	; do
+		rm -r 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() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/net-misc/electrum/files/3.1.2-desktop.patch b/net-misc/electrum/files/3.1.2-desktop.patch
new file mode 100644
index 000000000000..2c271dd60d88
--- /dev/null
+++ b/net-misc/electrum/files/3.1.2-desktop.patch
@@ -0,0 +1,21 @@
+diff -Naur Electrum-3.1.2.orig/electrum.desktop Electrum-3.1.2/electrum.desktop
+--- Electrum-3.1.2.orig/electrum.desktop	2018-03-24 06:42:16.000000000 -0400
++++ Electrum-3.1.2/electrum.desktop	2018-04-01 08:37:43.362027638 -0400
+@@ -3,7 +3,7 @@
+ 
+ [Desktop Entry]
+ Comment=Lightweight Bitcoin Client
+-Exec=sh -c 'PATH="$HOME/.local/bin:$PATH" electrum %u'
++Exec=electrum %u
+ GenericName[en_US]=Bitcoin Wallet
+ GenericName=Bitcoin Wallet
+ Icon=electrum
+@@ -14,8 +14,4 @@
+ Terminal=false
+ Type=Application
+ MimeType=x-scheme-handler/bitcoin;
+-Actions=Testnet;
+ 
+-[Desktop Action Testnet]
+-Exec=sh -c 'PATH="$HOME/.local/bin:$PATH" electrum --testnet %u'
+-Name=Testnet mode
diff --git a/net-misc/electrum/files/3.1.2-no-user-root.patch b/net-misc/electrum/files/3.1.2-no-user-root.patch
new file mode 100644
index 000000000000..0d4781717714
--- /dev/null
+++ b/net-misc/electrum/files/3.1.2-no-user-root.patch
@@ -0,0 +1,17 @@
+diff -Naur Electrum-3.1.2.orig/setup.py Electrum-3.1.2/setup.py
+--- Electrum-3.1.2.orig/setup.py	2018-03-28 04:51:11.000000000 -0400
++++ Electrum-3.1.2/setup.py	2018-03-31 15:05:45.540757981 -0400
+@@ -28,13 +28,6 @@
+     opts, _ = parser.parse_known_args(sys.argv[1:])
+     usr_share = os.path.join(sys.prefix, "share")
+     icons_dirname = 'pixmaps'
+-    if not os.access(opts.root_path + usr_share, os.W_OK) and \
+-       not os.access(opts.root_path, os.W_OK):
+-        icons_dirname = 'icons'
+-        if 'XDG_DATA_HOME' in os.environ.keys():
+-            usr_share = os.environ['XDG_DATA_HOME']
+-        else:
+-            usr_share = os.path.expanduser('~/.local/share')
+     data_files += [
+         (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
+         (os.path.join(usr_share, icons_dirname), ['icons/electrum.png'])
diff --git a/net-misc/electrum/files/3.1.2-pip-optional-pkgs.patch b/net-misc/electrum/files/3.1.2-pip-optional-pkgs.patch
new file mode 100644
index 000000000000..f5e0015a7dff
--- /dev/null
+++ b/net-misc/electrum/files/3.1.2-pip-optional-pkgs.patch
@@ -0,0 +1,13 @@
+diff -Naur Electrum-3.1.2.orig/setup.py Electrum-3.1.2/setup.py
+--- Electrum-3.1.2.orig/setup.py	2018-03-31 15:08:48.919694817 -0400
++++ Electrum-3.1.2/setup.py	2018-03-31 15:09:28.738594744 -0400
+@@ -37,9 +37,6 @@
+     name="Electrum",
+     version=version.ELECTRUM_VERSION,
+     install_requires=requirements,
+-    extras_require={
+-        'full': requirements_hw + ['pycryptodomex'],
+-    },
+     packages=[
+         'electrum',
+         'electrum_gui',