commit a5cc197177476153b697f8765def876f174d1fa7
parent be72cd1fd6f3c94eeff82ef02c4b727e61c42ce1
Author: parazyd <parazyd@dyne.org>
Date: Mon, 8 Jan 2018 14:24:21 +0100
net-misc/electrum: Update to 3.0.5
Diffstat:
5 files changed, 182 insertions(+), 180 deletions(-)
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
@@ -1 +1 @@
-DIST Electrum-3.0.4.tar.gz 2638651 SHA256 526675ddde26908c3b0d46e024a4df2e780b6edb4c36a793d64ca5c8fcea7b0f SHA512 65626a9c6a799f8d73d50606ebd2fdd297483d4b71bcd8bbee7b1a4a9f2ad9d266ba1c449afd0c353bab8f36820fc2067847d20509fd7c4007480c532c2071db WHIRLPOOL 8057498fee39859ba525e772fabf7ac18582b04e81e2372cdf54cf61e128ac61008249872b0dc60fbb5c5a34d0c4427128b795f0214bb0b076481d6b3da9fecb
+DIST Electrum-3.0.5.tar.gz 2639766 SHA256 61ebc06782433f928853188762c6f3098bd3d08d54c34b5594233d196e51e01b SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39 WHIRLPOOL 9a02a63a389d1a2969d6946a0159c83d4b2fd49119cd08543ee8657f526aea7711fbd5277f339265a0f286641c4d8c457ab99c349787dc9354c20eb2eceedd08
diff --git a/net-misc/electrum/electrum-3.0.4.ebuild b/net-misc/electrum/electrum-3.0.4.ebuild
@@ -1,164 +0,0 @@
-# Copyright 1999-2017 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 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"
-LINGUAS="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 pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-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}/3.0.1-no-user-root.patch"
-
- # Prevent icon from being installed in the wrong location
- sed -i '/icons/d' setup.py || die
-
- # Remove unrequested localization files:
- for lang in ${LINGUAS}; do
- use "linguas_${lang}" && continue
- rm -r "lib/locale/${lang}" || die
- done
-
- local wordlist=
- for wordlist in \
- $(usex linguas_ja_JP '' japanese) \
- $(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
- $(usex linguas_es_ES '' spanish) \
- $(usex linguas_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
@@ -0,0 +1,164 @@
+# Copyright 1999-2017 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 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"
+LINGUAS="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 pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR vi_VN zh_CN"
+
+IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
+
+for lingua in ${LINGUAS}; do
+ IUSE+=" linguas_${lingua}"
+done
+
+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}/3.0.5-no-user-root.patch"
+
+ # Prevent icon from being installed in the wrong location
+ sed -i '/icons/d' setup.py || die
+
+ # Remove unrequested localization files:
+ for lang in ${LINGUAS}; do
+ use "linguas_${lang}" && continue
+ rm -r "lib/locale/${lang}" || die
+ done
+
+ local wordlist=
+ for wordlist in \
+ $(usex linguas_ja_JP '' japanese) \
+ $(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \
+ $(usex linguas_es_ES '' spanish) \
+ $(usex linguas_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/files/3.0.1-no-user-root.patch b/net-misc/electrum/files/3.0.1-no-user-root.patch
@@ -1,15 +0,0 @@
---- ./setup.py.orig 2017-01-06 19:17:44.294137848 +0000
-+++ ./setup.py 2017-01-06 19:17:50.093161327 +0000
-@@ -23,12 +23,6 @@
- parser.add_argument('--root=', dest='root_path', metavar='dir', default='/')
- opts, _ = parser.parse_known_args(sys.argv[1:])
- usr_share = os.path.join(sys.prefix, "share")
-- if not os.access(opts.root_path + usr_share, os.W_OK) and \
-- not os.access(opts.root_path, os.W_OK):
-- 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']),
- ]
diff --git a/net-misc/electrum/files/3.0.5-no-user-root.patch b/net-misc/electrum/files/3.0.5-no-user-root.patch
@@ -0,0 +1,17 @@
+diff --git a/setup.py b/setup.py
+index 0cb92f4..4174055 100755
+--- a/setup.py
++++ b/setup.py
+@@ -21,12 +21,6 @@ if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']:
+ parser.add_argument('--root=', dest='root_path', metavar='dir', default='/')
+ opts, _ = parser.parse_known_args(sys.argv[1:])
+ usr_share = os.path.join(sys.prefix, "share")
+- if not os.access(opts.root_path + usr_share, os.W_OK) and \
+- not os.access(opts.root_path, os.W_OK):
+- 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, 'pixmaps/'), ['icons/electrum.png'])
