diff options
| -rw-r--r-- | net-misc/electrum/Manifest | 3 | ||||
| -rw-r--r-- | net-misc/electrum/electrum-2.3.3.ebuild | 144 | ||||
| -rw-r--r-- | net-misc/electrum/electrum-2.7.15.ebuild (renamed from net-misc/electrum/electrum-2.5.4.ebuild) | 64 | ||||
| -rw-r--r-- | net-misc/electrum/files/2.7.15-no-user-root.patch | 15 |
4 files changed, 51 insertions, 175 deletions
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest index 2e7eb6bf3e4b..6d7ae71ecc67 100644 --- a/net-misc/electrum/Manifest +++ b/net-misc/electrum/Manifest @@ -1,4 +1,3 @@ DIST Electrum-2.1.1.tar.gz 1778994 SHA256 958c7113072aa4a00a7e58a6e325d952fc35896a8678952cf6487636f74164e0 SHA512 06277a810a6533cc800c6813f874a0a6e3a7e598bdd47b73a6edb440bc5efefc56edacc44c15349e3d0c72d350700c67025f43e5478b4ae838af57acc1c91f52 WHIRLPOOL 2bf9392ebbd6e7b63e4e1e12cf72356dae1e1605a3c543c3a174229247fbb280412df5fac37a195b815018b8425d88618be54d4f3b58e37273ba40776f6b3765 -DIST Electrum-2.3.3.tar.gz 1971994 SHA256 72bac30a4d82c8fbc453fab2d1fa391af690884e1727088aa969d25891a9fc0d SHA512 26c2d3eaece738a67546168d82a89c7bd5c71a146c678d186514626027d6edac4e985f08e5d6ce34217b91cefa88be0174f5f45e8caba5da4c50911780e37f1b WHIRLPOOL e10bf9d10c64e1950dd2bb48ce1fca2950acdeefd99483825751acbbf29806494cbb629ac1d51f24978a8a6a2df2ce73de2910380f8e26e4a0884bcc1f116406 -DIST Electrum-2.5.4.tar.gz 2114549 SHA256 c0b00f440884fe3f087e842c44914e1c5f1139d0288ecb74ba6e1ff0b2504aa3 SHA512 52ee11aa2265fea5b6302fb85724d27e47c049f81743854aeb7c2fe517f2b68628b67e1b44f543e64671b4b40731c532d45097f1d25954a6876bc3ee43cdb847 WHIRLPOOL 7322ca5c54ca99c42e2df118e5e792e3f0fee1359d0445a430ffa016b1edb890b81664f11b9532fe403c0c057212afc0057e3af455aff79b8e40f23aa11605ad DIST Electrum-2.6.4.tar.gz 5717600 SHA256 2ab53b434206ed8ae72e9cadb22d44ef9ba720a7d052abe102f5d55cafbef866 SHA512 7ae2bf70497b073d74232fd90e0677148b1697803183cc32ed10a34d3098d7228ed988e9c0708086410949f0d2cc1fd408d7f2ce62594e325ec9b84e42ff03b2 WHIRLPOOL 368c1d3c41dd9170451fa48261f557fd0b9f2b3ab30396b5177aa9c4632813ad2225eb4ce2982d290dc63296434a369dca2d01f28add52e11f4b77d76f129e4f +DIST Electrum-2.7.15.tar.gz 1967697 SHA256 1f237b394079ec5ced34ae09dc6b50472e51233dd1dfef580127168e293b9652 SHA512 2f4f5181dcf0b98ce34348c296e50383b677db1fd14fa0052a0168a7c880d18d04ebb9a91dbb7316e09adeda275cc87b5457c8f0925b3635a1c769c81f31165c WHIRLPOOL b7a85fd9a4f7fdf5f64dc1182630b9d5b1bb033e49ebb00f1dd421d93c02f8fab8a0679de9a2fae074fdda5932fbfd261d5c8a2d6be3940821f18f82d46f2e28 diff --git a/net-misc/electrum/electrum-2.3.3.ebuild b/net-misc/electrum/electrum-2.3.3.ebuild deleted file mode 100644 index 7f1acf82bec7..000000000000 --- a/net-misc/electrum/electrum-2.3.3.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="ncurses?" - -inherit eutils 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="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -LINGUAS="ar_SA cs_CZ da_DK de_DE el_GR eo_UY es_ES fr_FR hu_HU hy_AM id_ID it_IT ja_JP ky_KG lv_LV nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH vi_VN zh_CN" - -IUSE="cli cosign +fiat greenaddress_it gtk3 ncurses qrcode +qt4 sync trustedcoin_com vkb" - -for lingua in ${LINGUAS}; do - IUSE+=" linguas_${lingua}" -done - -REQUIRED_USE=" - || ( cli gtk3 ncurses qt4 ) - cosign? ( qt4 ) - fiat? ( qt4 ) - greenaddress_it? ( qt4 ) - qrcode? ( qt4 ) - sync? ( qt4 ) - trustedcoin_com? ( qt4 ) - vkb? ( qt4 ) -" - -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/ecdsa-0.9[${PYTHON_USEDEP}] - dev-python/slowaes[${PYTHON_USEDEP}] - dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] - dev-python/tlslite[${PYTHON_USEDEP}] - dev-python/qrcode[${PYTHON_USEDEP}] - dev-python/PySocks[${PYTHON_USEDEP}] - dev-libs/protobuf[python,${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - gtk3? ( - dev-python/pygobject:3[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) - qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) - qt4? ( - dev-python/PyQt4[${PYTHON_USEDEP}] - ) - ncurses? ( dev-lang/python ) -" - -S="${WORKDIR}/${MY_P}" - -DOCS="RELEASE-NOTES" - -src_prepare() { - # 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 - - validate_desktop_entries - - # Remove unrequested localization files: - for lang in ${LINGUAS}; do - use "linguas_${lang}" && continue - rm -r "lib/locale/${lang}" || die - done - - local wordlist= - # french is unfinished - for wordlist in \ - $(usex linguas_es_ES '' spanish) \ - $(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \ - french \ - $(usex linguas_ja_JP '' japanese) \ - ; do - rm "lib/wordlist/${wordlist}.txt" || die - sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die - done - - # Remove unrequested GUI implementations: - local gui - for gui in \ - $(usex cli '' stdio) \ - $(usex gtk3 '' gtk ) \ - $(usex qt4 '' qt ) \ - $(usex ncurses '' text ) \ - ; do - rm gui/"${gui}"* -r || die - done - - if ! use qt4; then - sed -i "s/'electrum_gui\\.qt',//;/\"qt\\/themes/d" setup.py || die - local bestgui=$(usex gtk3 gtk $(usex ncurses text stdio)) - sed -i "s/\(config.get('gui', \?\)'classic'/\1'${bestgui}'/" electrum || die - fi - - local plugin - # btchipwallet requires python btchip module (and dev-python/pyusb) - # trezor requires python trezorlib module - for plugin in \ - $(usex cosign '' cosigner_pool ) \ - $(usex fiat '' exchange_rate ) \ - $(usex greenaddress_it '' greenaddress_instant) \ - $(usex sync '' labels ) \ - trezor \ - $(usex trustedcoin_com '' trustedcoin ) \ - $(usex vkb '' virtualkeyboard ) \ - ; do - rm plugins/"${plugin}"* || 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-2.5.4.ebuild b/net-misc/electrum/electrum-2.7.15.ebuild index bf3822e77a8f..51e965b23aa1 100644 --- a/net-misc/electrum/electrum-2.5.4.ebuild +++ b/net-misc/electrum/electrum-2.7.15.ebuild @@ -14,22 +14,21 @@ DESCRIPTION="User friendly Bitcoin client" HOMEPAGE="https://electrum.org/" SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz" -LICENSE="GPL-3" +LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -LINGUAS="ar_SA cs_CZ de_DE eo_UY fr_FR hy_AM it_IT ky_KG nb_NO no_NO pt_BR ro_RO sk_SK ta_IN vi_VN bg_BG da_DK el_GR es_ES hu_HU id_ID ja_JP lv_LV nl_NL pl_PL pt_PT ru_RU sl_SI th_TH zh_CN" +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 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" -IUSE="cli cosign email +fiat greenaddress_it gtk3 ncurses qrcode +qt4 sync trustedcoin_com vkb" +IUSE="cli cosign email greenaddress_it ncurses qrcode +qt4 sync trustedcoin_com vkb" for lingua in ${LINGUAS}; do IUSE+=" linguas_${lingua}" done REQUIRED_USE=" - || ( cli gtk3 ncurses qt4 ) + || ( cli ncurses qt4 ) cosign? ( qt4 ) email? ( qt4 ) - fiat? ( qt4 ) greenaddress_it? ( qt4 ) qrcode? ( qt4 ) sync? ( qt4 ) @@ -38,26 +37,21 @@ REQUIRED_USE=" " RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] dev-python/ecdsa[${PYTHON_USEDEP}] + dev-python/jsonrpclib[${PYTHON_USEDEP}] dev-python/pbkdf2[${PYTHON_USEDEP}] - dev-python/pyasn1[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${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/PySocks[${PYTHON_USEDEP}] dev-python/tlslite[${PYTHON_USEDEP}] dev-libs/protobuf[python,${PYTHON_USEDEP}] virtual/python-dnspython[${PYTHON_USEDEP}] qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] ) - gtk3? ( - dev-python/pygobject:3[${PYTHON_USEDEP}] - x11-libs/gtk+:3[introspection] - ) qt4? ( - dev-python/PyQt4[${PYTHON_USEDEP}] + dev-python/PyQt4[X,${PYTHON_USEDEP}] ) ncurses? ( dev-lang/python ) " @@ -67,6 +61,8 @@ 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 @@ -84,8 +80,7 @@ src_prepare() { local wordlist= for wordlist in \ $(usex linguas_ja_JP '' japanese) \ - $(usex linguas_pt_BR '' portuguese) \ - $(usex linguas_pt_PT '' portuguese) \ + $(usex linguas_pt_BR '' $(usex linguas_pt_PT '' portuguese)) \ $(usex linguas_es_ES '' spanish) \ $(usex linguas_zh_CN '' chinese_simplified) \ ; do @@ -94,33 +89,43 @@ src_prepare() { done # Remove unrequested GUI implementations: - rm -rf gui/android* - rm -rf gui/jsonrpc* - rm -rf gui/kivy* - local gui + local gui setup_py_gui for gui in \ $(usex cli '' stdio) \ - $(usex gtk3 '' gtk ) \ + kivy \ $(usex qt4 '' qt ) \ $(usex ncurses '' text ) \ ; do rm gui/"${gui}"* -r || die done - if ! use qt4; then - sed -i "s/'electrum_gui\\.qt',//" setup.py || die - local bestgui=$(usex gtk3 gtk $(usex ncurses text stdio)) - sed -i "s/\(config.get('gui', \?\)'classic'/\1'${bestgui}'/" electrum || die + # 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 - # btchipwallet requires python btchip module (and dev-python/pyusb) # trezor requires python trezorlib module # keepkey requires trezor for plugin in \ - $(usex cosign '' cosigner_pool ) \ - $(usex email '' email_requests ) \ - $(usex fiat '' exchange_rate ) \ + $(usex cosign '' cosigner_pool ) \ + hw_wallet \ + ledger \ + $(usex email '' email_requests ) \ $(usex greenaddress_it '' greenaddress_instant) \ keepkey \ $(usex sync '' labels ) \ @@ -129,6 +134,7 @@ src_prepare() { $(usex vkb '' virtualkeyboard ) \ ; do rm -r plugins/"${plugin}"* || die + sed -i "/${plugin}/d" setup.py || die done distutils-r1_src_prepare diff --git a/net-misc/electrum/files/2.7.15-no-user-root.patch b/net-misc/electrum/files/2.7.15-no-user-root.patch new file mode 100644 index 000000000000..e98cf30da42c --- /dev/null +++ b/net-misc/electrum/files/2.7.15-no-user-root.patch @@ -0,0 +1,15 @@ +--- setup.py.orig 2017-01-06 19:17:44.294137848 +0000 ++++ setup.py 2017-01-06 19:17:50.093161327 +0000 +@@ -21,12 +21,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']), + ] |