Fix bug #510688 and #509028

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

diff --git a/net-misc/electrum/ChangeLog b/net-misc/electrum/ChangeLog
index 0b00a5897ceb68de8bd2b2b76fb5f4f3354f9a8f..429ca8b055949d09b5630df48a8bb8645844f8b0 100644 (file)
--- a/net-misc/electrum/ChangeLog
+++ b/net-misc/electrum/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/electrum
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/ChangeLog,v 1.25 2015/02/14 11:57:17 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/ChangeLog,v 1.26 2015/03/01 13:42:11 blueness Exp $
+
+*electrum-1.9.8-r1 (01 Mar 2015)
+
+  01 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +electrum-1.9.8-r1.ebuild, +files/1.9.8-gtk3-fix.patch, metadata.xml:
+  Fix bug #510688 and #509028
 
   14 Feb 2015; Michał Górny <mgorny@gentoo.org> electrum-1.9.7.ebuild,
   electrum-1.9.8.ebuild:

diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 935dd16155d4aded4cee0efa3110c3d36951e303..8d109184bd4dd016109927382c8630ab50055227 100644 (file)
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 1.9.8-gtk3-fix.patch 737 SHA256 349b44e5578a265253696842dcd6ff6dfe47d8bb4b4f220a66de4e61074e44d6 SHA512 8c2c98e60d2f122d7111f8a554eb019f06a58edab16aa9ed21d490d8b2fd42cd632a279f47955df18eda465c6c854a08a3b9e4c998963c6841bb3c1462462c59 WHIRLPOOL 283f4582b09b2ef51fc6aa8f5f746c9a6d5aeee8a968027062c5b102cacd2a0670c3221bef6c087770d779a45c12c79f39a029c95b6e389b01cf31dfed1e4fa4
 AUX electrum.desktop-1.9.7.patch 291 SHA256 e14ccbeea2adefbc90a4d69b850ea82f8c627cadecba2a1dc2d675c075f2102e SHA512 386327ba6e0fec429e290b1bf8bb7775760a3bc7e0f7f03e037f370a3414e84c6f720f6432ea92f30a19007d1e02f9fcde8efb7f2327eaf6e5fe1f6dd06bb6df WHIRLPOOL 42386174e556c19b0618a0a8f6186aabcf0d67bf7fed55c80a63bee24bf03704d925497edc8de4a8389d9c5c6c85d9091ea01b01649853746332386097052915
 AUX setup.py-1.9.7.patch 1100 SHA256 b82d87fbffc4a9233e3000b853b4d5888c7ba7dd43baf0c9cbe52d6d6991505c SHA512 1e99dd8ef61e6d114a38a142fe35b60a6b0382cdd00ab03a8238abe49d4ec2c6bdd16b065abb4413de8a742b45d064a80d2e91889efc270feecd9059b136b0c4 WHIRLPOOL ea8bb39ebd9f8ffedfc7b0cbd8aea2a4d0d6dfc998b414ccedd9e5f3c2a9a2f4516b054d9c8073f34ee7ab37848d50597ac9b44abddf2f9362d52ab525e8bb87
 DIST Electrum-1.7.4.tar.gz 493103 SHA256 588ae22a1682e0be7e4f695777d36ee011a2b11552acefcfa0814227790cdb19 SHA512 5dda24ea73e2f018c8e1e757c86f33ec2d75f7065d2db95559c0ef983ee48849143219922b29ee585179b1a1b1a865b11b649dbb350dbfba0057126d5a0c59f8 WHIRLPOOL cb32f6976ac13e0a8191c2047e2cdb18f4cfd750f3808885e9bb5d0c1a676c2256e53da78b4163cb177c0fc38dfb71567802819ae9360fa5754da58e7eef3e0b
@@ -10,25 +11,24 @@ DIST Electrum-1.9.8.tar.gz 860858 SHA256 8fc144a32013e4a747fea27fff981762a6b9e14
 EBUILD electrum-1.7.4.ebuild 1883 SHA256 15e56b4d3807c7328af623b9e735325c90e58bc90a3a812dacd146cce6899c11 SHA512 3566207676d012205a539a2e220a311a286167680320b5163e006c9bb5ac8c5b9e400cff8d3d20721b7ff218c3e10ac163cce162e637ba3de8eccef054a7898e WHIRLPOOL 18e0151cbea90b920d4034ac2ae3958e0e15da9f96f611679d1ebb4a7822f89d0cea9518a920d4cb604d22a0146abd63f09bc6dacc9aebc402b7545ab8a9c8f9
 EBUILD electrum-1.8.1.ebuild 1908 SHA256 36df3d9f2ca84f2dcead4e82555a71da7d76c4d065c36229857752964ecb7ba4 SHA512 ea2c9ab814b8238c88068261b2203b2b6f95a0acac544b38924e25b1cdfa902b8e3ea4f389512277eb98c736412c6695dcd8d9eb2798930710ad70ec04d5ec66 WHIRLPOOL 2baf332c7a34c67b9751e2e988a1b8a0a7d7a7ebb69662777b3efc357390ab32f9799f35094160db7c2c7717514c66f1d1d1b9d39ab957b9cfa9892ef4725010
 EBUILD electrum-1.9.7.ebuild 2398 SHA256 29955d53764489a3e1b3dd46044fa6f5cf3b096dd4423e0e409194ac3ea8af71 SHA512 0bf12b96ddb47b325e089d86c067ed82d1f1d89e2312b317f309cc9be077d7be19781ff827d48d6281566c027634da0e2ced518d7802d3572eb6da4c0f14fd98 WHIRLPOOL 06487a1a3c47647ac5a9226c65a71752db7032a8d94272090183ea96628894ee0be044a0f7b8ded5834db8380547599475f8affd7522e4e04abe127cd6bc2f14
+EBUILD electrum-1.9.8-r1.ebuild 3058 SHA256 62d2ae808b485257494158bcd234a5af5c70dda7f2b8f7712637783cea0681d1 SHA512 a9110886c50dbde60d2ded54457fb2046af1ae600ff4a038e2539436fb0331b87c86848ea64ddbc3df6b1fbca22b55796259e0810c20bd05bf9f4f872d9d751a WHIRLPOOL 8ebdd58898531a913aefe8412fcc2197657454cf43c04d2a8c19a71c8e7340374f5fbdf21e22b5506412410a2f399cae77e537df08b02509468d055022bf53ed
 EBUILD electrum-1.9.8.ebuild 2398 SHA256 022e5241148c0cb1db0386d1b3c4ef9f674bbe3b8226e019d9a174ab86a2a004 SHA512 70604cf80391aca2c73b2238249eedad0e38d76d78f5cc4ad16d80425c44d14aafbb33842d6f30ade0dac62bc749f79df9b8952c2c141f6bdf1696ef5f6f81ed WHIRLPOOL 611fb8c8ead679215c3dd5d1be4aa29b0a0ab82bd6a56434fe76e04c8a241666c7814e0ea68004453243186a6fd8c9fc21c7eeb10b55676243e8942b810b1682
-MISC ChangeLog 3803 SHA256 4edc759ea2b32fb6fbeba88366d65ce7eb1e1f90290e95429329b2bf25e9dd72 SHA512 253377c30983d4cff5a746d94216e8bae979b4a7c999e9ed8a52fb4b41013b171ea18dd6c44108a3b003506b1e9631d6b6f2f99db7b2d9fd4b479ae00aab3e37 WHIRLPOOL 08af06cc4376c19071b8323dc44bde9d2ed334953dcd4876ac1eac79b073de87aaa1884e0756cdc6bce2988544b33b633551020c0bf7204dcbd82c8b409164df
-MISC metadata.xml 667 SHA256 9ba9f278da011a3522b1bb8973b501116f123480af5572fb7162faf3cecc0274 SHA512 b661eee1eb5c9baf2404f9b7c215f751f66b362550c8b920578b6dc696e112ab244aa25081178456104076c3289b17b3e4c7d128c638767acfae9e06f0e0c932 WHIRLPOOL 01f23285b706709d6a3571bd63a28aaa744ccb149f370a76b56f80eaa0b0c8392f914422633f9324f240e8aa2a6be360834d16430af942388d985aa88737cfeb
+MISC ChangeLog 3997 SHA256 b5bc496a8b2206e1ef0e2b9fae55967b1257a068bf11e016d83e3896822cdb99 SHA512 2bdbbce0b99537bec9b71957d8d577bcdd6adb56592d272524d06f83d15b15701f4851427bb04be525779488c66cf8346db59f3b2de5ba3fd4837e1d30ae3bcc WHIRLPOOL a0ceb4901bdef24eb777970f922d6cdb430dc3343fdfdc5f39de6d8b1463757bd94b755c888a1e064f04b0c7577b652506e25e7f9bc0b2935323881c42e28de4
+MISC metadata.xml 1231 SHA256 883cdc18373e7f92783b96e6017a8e79bdb6b99a10a69bf001afb3637ff38eeb SHA512 c15f178f4c22f7bd5db0181f0042970f865856579ef72022204639f498f73461a36b52e511f9f7212b6a2f5ad7a86bd70e2cfa70382a7bd9c919efcd31c3a1ce WHIRLPOOL a21ea01ae8ba69391ae4cdf4ad6e54cae4fd75dfa1da16f8a05a38cd6a621b24e1472f17287f3a5003b6af3a0ccdc6e7803bf0d3779cbcc2e1d8269abe610ae3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJU3zgfXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7NcQALgEws5tjQlfThRdLHe443CB
-UCv5Fo3ESqoSrp7FCXR6JXwoD0FnrxT1FCR8caTMrGcQWPrYJz6CxJkDULVxZhmc
-G1qQa3Fg5JkkeTPMrSkrrtW0KhIRpPAERc/24Lt2H+uyIaOE2kdTzrHMpWTyeMp1
-0Ho85tTUpNKkvNiMQ2clkTfNaYiGLRAq6NY0b2GOyEc/j/Jt6jruBQTZ8+ixBSUU
-TX/dPb2+ktKpCYHq+CakeNaw8ebOPlb4ksjLNFl9Yb1JbrAA9tPHabCkGpcDoZLq
-TZXdmld6wT4xcLlZm43PEA/LPkgbfv5RjrFSelm6vt75RS/gm4uZlxTkKhzEaODM
-ORd7eYjOmM2yfJERTb1PmoMe7N2lXisO3+ezMaYJONgmz5SDpD2TUociIVbwXGDp
-024XW2LS32e+4jc9aGpE1OV9rM3qxjrRFJnBPh/khE5RQoJ2kDkTXIO7plNBseXu
-gJw1iSgSR1hhrbZuCrVyjmfOH7p36oUvmTKMr9mNoZZHBEClcHEMuC6fwdpNPR0Y
-aTkaqNOXBo/LPu0Pd9P2Coyzwh+CSQf3Ov55HXJa0FWogaL2yD/oTEj+Yp3CoOpC
-Yd1DIThhQCnBje7gRMK70fZqG/esCvf7TLtn0TXUHARAuVWJd0qQUXY4jIhwGPAu
-s1xPJL48a8kYSMQWZBA6
-=xU3S
+iQIcBAEBCAAGBQJU8xe5AAoJEJOE+m71LUu6L/gP/jGyBwyJOpJltXCJ9niUEQnf
+EwXi8YUt4e4rcQkl3PBhGnt2b2KX1JLjXsNoxdUeN8h2Rg0+KOBqV2+0JspmahUP
+6Xt4m8WdGJkdwQzy2YTClUbsPIcxNa0FYC4eUuUR3RqrA7oDZPQ1VBB1i49r8Igt
+mdl/qO75oz7CWGTH5TC1cm675k2bWJTcxadI3VG35R7H3jyJcWj6xsWN3viGS7Sr
++bX9M8YpOoo4T5frJA5cgxLAZbLegL9DwIydhwDdXMtL0+iWbeNjv8aLWfcuOu1p
+ZXaAOxKmsiLRzRVI79mcPYVHLZAWucFNRC8wEyTJ7AEgADWbqFcHuqQ6gaToS2Aa
+YMJkX5Lx6ajKPFECewU3SGCz+HYUpFb3r87NRWosA/KUcgbw1wR52qDbtgPsj49U
+Hh/Kiw0dZQQ6zOwDYwWSKUD7O+1dIvabNWWKIo0SDNpq5MzXIN3sifXCXkHemw4u
+tE9l4cDc7Pj0ucyLE+nomHR8irxxxSdxBVMO94/jakslNCFr3wTN1vaMP6Kc6ui4
+5RTkJX7BOOGVs26iOtj8wLMt89C/FUKgRzO2BXFFPMIQVcMngXPfluC8idYbeYsZ
+zg7WCKUI5oCslGXr0lcf5J5XrPgkeC8C+0CTxfBueyREwaEXJMloXwx15DWYAVE2
+n1HEMNdHw7rjAeDVbzq1
+=IdeU
 -----END PGP SIGNATURE-----

diff --git a/net-misc/electrum/electrum-1.9.8-r1.ebuild b/net-misc/electrum/electrum-1.9.8-r1.ebuild
new file mode 100644 (file)
index 0000000..629f50f
--- /dev/null
+++ b/net-misc/electrum/electrum-1.9.8-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.9.8-r1.ebuild,v 1.1 2015/03/01 13:42:11 blueness Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="ncurses="
+
+inherit eutils distutils-r1 gnome2-utils
+
+MY_P=Electrum-${PV}
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="http://electrum.org/"
+SRC_URI="http://download.electrum.org/download/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LINGUAS="ar_SA cs_CZ de_DE eo_UY es_ES fr_FR hu_HU
+                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="aliases cli coinbase_com +fiat gtk3 ncurses pos qrcode +qt4 sync vkb"
+
+for lingua in ${LINGUAS}; do
+       IUSE+=" linguas_${lingua}"
+done
+
+REQUIRED_USE="
+       || ( cli gtk3 ncurses qt4 )
+       aliases? ( qt4 )
+       coinbase_com? ( qt4 )
+       fiat? ( qt4 )
+       pos? ( qt4 )
+       qrcode? ( qt4 )
+       sync? ( qt4 )
+       vkb? ( qt4 )
+"
+
+RDEPEND="
+       dev-python/setuptools[${PYTHON_USEDEP}]
+       >=dev-python/ecdsa-0.9[${PYTHON_USEDEP}]
+       dev-python/slowaes[${PYTHON_USEDEP}]
+       gtk3? (
+               dev-python/pygobject:3[${PYTHON_USEDEP}]
+               x11-libs/gtk+:3[introspection]
+       )
+       qrcode? ( media-gfx/zbar[python,v4l,${PYTHON_USEDEP}] )
+       qt4? (
+               coinbase_com? ( dev-python/PyQt4[${PYTHON_USEDEP},webkit] )
+               dev-python/PyQt4[${PYTHON_USEDEP}]
+       )
+       ncurses? ( dev-lang/python )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="RELEASE-NOTES"
+
+src_prepare() {
+       # Prevent .desktop, icon, and translations from being installed in the wrong locations
+       epatch "${FILESDIR}"/setup.py-1.9.7.patch
+
+       epatch "${FILESDIR}"/electrum.desktop-1.9.7.patch
+       validate_desktop_entries
+
+       # Bugfix
+       epatch "${FILESDIR}/${PV}-gtk3-fix.patch"
+
+       # Remove unrequested localization files:
+       for lang in ${LINGUAS}; do
+               if use linguas_${lang}; then
+                       test -f "locale/${lang}/LC_MESSAGES/${PN}.mo" || die
+               else
+                       rm -r "locale/${lang}" || die
+               fi
+       done
+
+       # Remove unrequested GUI implementations:
+       local gui
+       for gui in  \
+               $(usex cli      '' stdio)  \
+               $(usex gtk3     '' gtk  )  \
+               $(usex qt4      '' qt   )  \
+               $(usex ncurses  '' text )  \
+       ; do
+               sed -i "/'electrum_gui\.${gui}/d" setup.py || die
+       done
+
+       if ! use qt4; then
+               local bestgui=$(usex gtk3 gtk $(usex ncurses text stdio))
+               sed -i "s/\(config.get('gui', \?\)'classic'/\1'${bestgui}'/" electrum || die
+       fi
+
+       local plugin
+       for plugin in  \
+               $(usex aliases       '' aliases         )  \
+               $(usex coinbase_com  '' coinbase_buyback)  \
+               $(usex fiat          '' exchange_rate   )  \
+               $(usex sync          '' labels          )  \
+               $(usex pos           '' pointofsale     )  \
+               $(usex qrcode        '' qrscanner       )  \
+               $(usex vkb           '' virtualkeyboard )  \
+       ; do
+               sed -i "/'electrum_plugins\.${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/files/1.9.8-gtk3-fix.patch b/net-misc/electrum/files/1.9.8-gtk3-fix.patch
new file mode 100644 (file)
index 0000000..c101d2f
--- /dev/null
+++ b/net-misc/electrum/files/1.9.8-gtk3-fix.patch
@@ -0,0 +1,11 @@
+--- Electrum-1.9.8/gui/gtk.py  2014-03-11 14:12:31.000000000 +0000
++++ Electrum-1.9.8/gui/gtk.py  2015-03-01 08:01:02.851740805 +0000
+@@ -87,7 +87,7 @@
+     # ask if the user wants to create a new wallet, or recover from a seed. 
+     # if he wants to recover, and nothing is found, do not create wallet
+     dialog = Gtk.Dialog("electrum", parent=None, 
+-                        flags=Gtk.DialogFlags.MODAL|Gtk.DialogFlags.NO_SEPARATOR, 
++                        flags=Gtk.DialogFlags.MODAL | getattr(Gtk.DialogFlags, 'NO_SEPARATOR', 0), 
+                         buttons= ("create", 0, "restore",1, "cancel",2)  )
+ 
+     label = Gtk.Label("Wallet file not found.\nDo you want to create a new wallet,\n or to restore an existing one?"  )

diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index 9a0abf718e35150f4f5610192aaefc6b68c85fec..5de1fa13ba2174fd590ea7c891a4a212d24225ab 100644 (file)
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -19,6 +19,14 @@
                <name>Emery Hemingway</name>
        </maintainer>
        <use>
+               <flag name='aliases'>Enable plugin for looking up aliases</flag>
+               <flag name='cli'>Enables the CLI interface</flag>
+               <flag name='coinbase_com'>Enable plugin to use Coinbase.com's buyback program</flag>
+               <flag name='fiat'>Enable plugin for looking up fiat values of bitcoin</flag>
+               <flag name='gtk3'>Enable support for gtk+3</flag>
+               <flag name='pos'>Enable plugin for point-of-sale operation</flag>
                <flag name='qrcode'>Enable QR code scanning with <pkg>media-gfx/zbar/</pkg></flag>
+               <flag name='sync'>Enable plugin to sync wallet metadata across multiple Electrum clients</flag>
+               <flag name='vkb'>Enable plugin for virtual keyboard</flag>
        </use>
 </pkgmetadata>