gentoo resync : 13.01.2018

4 files changed, 2 insertions, 348 deletions

diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 3e2204080fdb..1c99c0e15994 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,9 +1,5 @@
 AUX 2.7.15-no-user-root.patch 704 BLAKE2B d7353f8338be379cd31f42cc29c4346930c191b3157084df658eebc0d1e4202d9711d8694b6b6ba65285f0de1e83ab55188d9d79a2e6a45c919c1dcb64003b91 SHA512 3bce2f6b0605e708107097b8bb033681c901afc535c1921712d3b2db172cc296b50cc4a833b0d21c9718fc094d37d9d9b3c2e9abb65d6f96449ae91635d3101c
 AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
-DIST Electrum-2.7.15.tar.gz 1967697 BLAKE2B 94a189fb1b950dc2691cfa92143d68052f615e534fb9d3d7feed92a39bb717199b227d0e265715e86c3ed9b8ccd743fa77f2691dfc5b47073b03f80152185565 SHA512 2f4f5181dcf0b98ce34348c296e50383b677db1fd14fa0052a0168a7c880d18d04ebb9a91dbb7316e09adeda275cc87b5457c8f0925b3635a1c769c81f31165c
-DIST Electrum-3.0.3.tar.gz 2590410 BLAKE2B 676422bc14ce597a2b4903ea4d7e3dcec1bd23424d678aa1c248e824a1656a60afaef284c8ba22242da3cfdbe4421dba04f4aeef42ca507043988067a340d0b9 SHA512 6628b6621e3502bb9782ec7ce0fd11a657c10dfaab6a5c4de4e4bae5bc1207fa55f642a92fcca08e1f342e0ecf8dd0c72134db7020e03df2ed6f81b27c49aa30
 DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df8ca2e3204333e6edd7db98ecbeebdf81f4ac819de8b87c7593e83f948d091d48d55cdff08af76322d94bacec0fd SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39
-EBUILD electrum-2.7.15.ebuild 4097 BLAKE2B 47368e67b82f77c16a37492dc766695cbdc8da78e98052262a9213febcad4b6ed5d958b126566f118951b1b4fc26f37874052417d5fa92cb16000b37e24fadeb SHA512 1a147ff600c857c1b4743d19b4bfdab6d474d2d31a0b97b6f4692ed639514cb8965200c41e5e6666eb119e3f7af35f6d47aeb4408489d4ef83929ceaa433ad8f
-EBUILD electrum-3.0.3.ebuild 4258 BLAKE2B 322b1ae7d0ee7b936b70ec9a476470e2e9dc713a1115b7a4b2e9a7d23e484fa24a3ea85cab25b64bf6d734c3b17b96cbcf84f3013cbe8fbae364982ed80e26d5 SHA512 442cecdaedf04d2af3fab57a5144e15b7ed13681ab6181326a257cd0415f6335d09d61acc24155d0f2b67a19678e5ea6b69a59a81a5a48a67c81005bf0f4761f
-EBUILD electrum-3.0.5.ebuild 4258 BLAKE2B 322b1ae7d0ee7b936b70ec9a476470e2e9dc713a1115b7a4b2e9a7d23e484fa24a3ea85cab25b64bf6d734c3b17b96cbcf84f3013cbe8fbae364982ed80e26d5 SHA512 442cecdaedf04d2af3fab57a5144e15b7ed13681ab6181326a257cd0415f6335d09d61acc24155d0f2b67a19678e5ea6b69a59a81a5a48a67c81005bf0f4761f
+EBUILD electrum-3.0.5.ebuild 4256 BLAKE2B 6f8b98f75accac0d16401175ec13acbe355ae328b69b06a04d0e55e0ccfa95c34d4804a8239bed611188af59c54a346077701defd827aed4b525ee42ad2628d4 SHA512 09d6270945126e63ea0c8385ec4fb4726d7b029e12543fcf6466c1384bebb38ab87d5462e926f1928971423099cb49fa0cb9433c52b4230fff474eb29750a877
 MISC metadata.xml 1327 BLAKE2B d0029a93d9b105b621b2053498ff5c570e97e3945fb1c33252f85ab3110d06395b03d05b2625dc278ca8c36521762c74d52fcb9317055f9532e82c18168fb02e SHA512 3047791e1985494eeec1348c64e9a7ef6f9055cc01b0eb462dcb8958a6fb448d75ace206c33498cdd45a5470efc4091f5bc0bc062284a2bd2b0f4a6299591d09
diff --git a/net-misc/electrum/electrum-2.7.15.ebuild b/net-misc/electrum/electrum-2.7.15.ebuild
deleted file mode 100644
index ef6c1839e594..000000000000
--- a/net-misc/electrum/electrum-2.7.15.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses?"
-
-inherit distutils-r1 gnome2-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 fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL no_NO pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
-
-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="cli cosign email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt4 )
-	cosign? ( qt4 )
-	email? ( qt4 )
-	greenaddress_it? ( qt4 )
-	qrcode? ( qt4 )
-	sync? ( qt4 )
-	trustedcoin_com? ( qt4 )
-	vkb? ( qt4 )
-"
-
-RDEPEND="
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${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/slowaes[${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[python,v4l,${PYTHON_USEDEP}] )
-	qt4? (
-		dev-python/PyQt4[X,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-no-user-root.patch"
-
-	# Don't advise using PIP
-	sed -i "s/On Linux, try 'sudo pip install zbar'/Re-emerge Electrum with the qrcode USE flag/" lib/qrscanner.py || die
-
-	# 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 qt4      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt4      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 qt4; 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 cosign        '' cosigner_pool   ) \
-		hw_wallet \
-		ledger \
-		$(usex email         '' email_requests  ) \
-		$(usex greenaddress_it '' greenaddress_instant)  \
-		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
-
-	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
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/electrum/electrum-3.0.3.ebuild b/net-misc/electrum/electrum-3.0.3.ebuild
deleted file mode 100644
index 2b62832e8ba6..000000000000
--- a/net-misc/electrum/electrum-3.0.3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit 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="
-	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}/2.8.0-no-user-root.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               ) \
-		revealer \
-		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/electrum-3.0.5.ebuild b/net-misc/electrum/electrum-3.0.5.ebuild
index 2b62832e8ba6..47ccf45aef4d 100644
--- a/net-misc/electrum/electrum-3.0.5.ebuild
+++ b/net-misc/electrum/electrum-3.0.5.ebuild
@@ -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 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() {