Version bump

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

4 files changed, 53 insertions, 25 deletions

diff --git a/net-misc/electrum/ChangeLog b/net-misc/electrum/ChangeLog
index acde59f9185d..14b45a634d89 100644
--- a/net-misc/electrum/ChangeLog
+++ b/net-misc/electrum/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/electrum
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/ChangeLog,v 1.19 2013/12/17 12:51:33 blueness Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/ChangeLog,v 1.20 2014/01/18 13:55:28 blueness Exp $
+
+*electrum-1.9.7 (18 Jan 2014)
+
+  18 Jan 2014; Anthony G. Basile <blueness@gentoo.org> +electrum-1.9.7.ebuild,
+  -electrum-1.9.6.ebuild, metadata.xml:
+  Version bump
 
   17 Dec 2013; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
   Fix gpg signiture on Manifest
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 8ebef77ee329..cc11a5df1cdb 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -5,26 +5,26 @@ AUX electrum.desktop-1.9.6.patch 291 SHA256 e14ccbeea2adefbc90a4d69b850ea82f8c62
 AUX setup.py-1.9.6.patch 1100 SHA256 b82d87fbffc4a9233e3000b853b4d5888c7ba7dd43baf0c9cbe52d6d6991505c SHA512 1e99dd8ef61e6d114a38a142fe35b60a6b0382cdd00ab03a8238abe49d4ec2c6bdd16b065abb4413de8a742b45d064a80d2e91889efc270feecd9059b136b0c4 WHIRLPOOL ea8bb39ebd9f8ffedfc7b0cbd8aea2a4d0d6dfc998b414ccedd9e5f3c2a9a2f4516b054d9c8073f34ee7ab37848d50597ac9b44abddf2f9362d52ab525e8bb87
 DIST Electrum-1.7.4.tar.gz 493103 SHA256 588ae22a1682e0be7e4f695777d36ee011a2b11552acefcfa0814227790cdb19 SHA512 5dda24ea73e2f018c8e1e757c86f33ec2d75f7065d2db95559c0ef983ee48849143219922b29ee585179b1a1b1a865b11b649dbb350dbfba0057126d5a0c59f8 WHIRLPOOL cb32f6976ac13e0a8191c2047e2cdb18f4cfd750f3808885e9bb5d0c1a676c2256e53da78b4163cb177c0fc38dfb71567802819ae9360fa5754da58e7eef3e0b
 DIST Electrum-1.8.1.tar.gz 516341 SHA256 16746e35f2847feb8803aa9b34184ce79d3df88e0ea222a4e602e3b3830ec834 SHA512 0cd345c8ba8e66ab2094a569109029d4f402854da2135acf06ee07d086ac14cd1134c5a5dcaa432fabc31bccfd86782a29dc32465543f03054c0a8c9aeb5feee WHIRLPOOL 9485ade5124b253edbb562ccc6d7a6b7570bcada3e3063db2afdc568517d82aec9495eae4992e83b19fbc7f6205b7378fc237efb7c093be0b23c53baa1e05146
-DIST Electrum-1.9.6.tar.gz 742261 SHA256 e54186b83472da83843fceef8d174e1198647cfc427c958ccc6fd3451c2a8132 SHA512 83b255e5efd72334434ebf97ffd7f7bc694ba0fd89dd5a82484d1e20efed6b4bdaf63353b638df5c00c7cc6d8eee83ac5ed6550a93672fcfa12bc39910a5b261 WHIRLPOOL df9ae38932eaeeece27b7529b954613b67638b8575d0a5218700eede8a2ae048d5d6d0989be16fbcfbf8baa09f0c00dab924b731a98b55a2ecb6173ba9b425b0
+DIST Electrum-1.9.7.tar.gz 751357 SHA256 8d4cad6338982a515968425e95f14204ab2ed617867dbeef6b05bf8b46ffc659 SHA512 40e12524e1604ab067a6ce2c5c540c553520ed69da03a38da10d9c075b68c693986eb49dc558250a3e461dd310e10c0d65d22a5cbfaf8d7a2e9de48eb75fdf03 WHIRLPOOL d2147ff2b534a369846804c002f8c60f76afbb8dca1fb22e02f0a98770e2a05ebc0814ea8c99f51f3d83f09ef5c32432813e41b275158b5281386f6a67edf4b8
 EBUILD electrum-1.7.4.ebuild 1793 SHA256 664b19a7a0fc7f6a203a3dd799f269495538e726cf9930135969e5336d9bc05a SHA512 1b7c9d4972c3cb3178e3e4ab809f8c14aef7baba445af71c90df82161455034e051e8333f601694dc48015678e089adb79ed977b0ebca150730dc7c14c815b4e WHIRLPOOL 2616bf23653a0245565cedb43850713b19c351059ed4a41300b4a4d19cab4a616893302536cd204949399d42606798e71f70c0464f76f8fc6affacf6d6d972d1
 EBUILD electrum-1.8.1.ebuild 1818 SHA256 043068ad65ae7d1fcfce2b8ebecd7fd25fe4e32719aa100239b276914057db04 SHA512 b3eefa04bbe62954b1ca5a83a12f4bea0e04ad8118573d13d5e8da39838b61123523cab2755ab0eb25eca1693b471cf176f10936021d6d88a14b8f43d4231961 WHIRLPOOL 803e3f824d669a34d536059f6083fc91febb8baa896d01fbb96cded4b0d9b3a80ee81d789dfcf1cfa7289d371577aa0e7c303b392a73e7a5b296456b7fde5df7
-EBUILD electrum-1.9.6.ebuild 1996 SHA256 9329fcb74d4cb72d1e8bdab46f4c07965717db7fc99d4f12f5054089740f460b SHA512 7951b8c7bacbafcf24cafae29edb764855802165e61b06b68262d2769c272214c5394561b21b89306c9aac437a16335b91b30b537ad7a6a9d5d32525fad3e352 WHIRLPOOL 7ad633334d9034fbd90085d24976e72eda1bdd13ffb069b51eea51677136163d365eab06dc0789cef5dce7a844ad2d7c6e57ca695b7f1033affb66a467d55726
-MISC ChangeLog 2830 SHA256 60c89b5b286ee3f3869f50c10548e1152449ecbfecdaeeec8ed705b178425d70 SHA512 88bf1a83ed32dd36d174a206da4046d13c3e1010241851cb0b20363b751c7143cec786fa1d629289cae70f1a1c9fe1d83eb57ca40477bf68cb2fbc2f76aee9d5 WHIRLPOOL 8c1184c05ed527536e53e13a27ab1b7cca420c2dc2f91de0ecfd42b34cafff74c3baae1a8bd9a3cfeb546df489d375c505896e99467a4e89db9e3e021c19cd48
-MISC metadata.xml 472 SHA256 e97c20e859b288822e281765af714b85c70d48e4c84c2925e66a36182d1eb10d SHA512 1a77af9adfde40ba53f17f85a3e2c172a161ee01c81ea9d7ae02aa6764b4f03e24c48b3f39eb91d60369246801f3a2b8027640cb7b89a1afe9e5c43078dc9b58 WHIRLPOOL cf7b85cc0b0ed5d881fdacdf60730c41e09a7a462ece923dc81cf8c4aa0ef575f9d5eeac9897d5ae71159dd32541f91d3c0f2ddcac789fda36851b0ac97c8a88
+EBUILD electrum-1.9.7.ebuild 2289 SHA256 c1df52734e7f1aa6633b6378c6febb672f5e45b60c3d44d2da2574e2d79fcab5 SHA512 c728d2c7d081ded002291795aa89fd0e9d40c58ef0fb9aa3509b07dba07f29be8ce2b166ce35dc83babd07244ef2de1e43898addbc64a3800fdd9dd2f3f9d42c WHIRLPOOL f5576e5564574dd463aaaa272e0fd5a6d8dbc43526cbd22f653287d46660179f109766b13681040031a5069418ef90b3ac7ed86c8539349fa4c366514d86fa13
+MISC ChangeLog 2996 SHA256 b0b8d962061b5a1c2c44b74f9042dabff67a83e60fcd5bb53df5bbc60af46972 SHA512 566559444e29acd47d76f7a5df206941d61a375aeb5281cab60b475532179b36b0319706b65eee06661b393b232c498f949a49829392a19504f5aa1eaab91c8a WHIRLPOOL ee068abb3c50f158eb286f0d3baeb852aa2b7ecaa493996770faed12bacd279a973847e28c94a48ecde3fe7c8bc43c739509563403bb7a126c1a2d1eb1c34d38
+MISC metadata.xml 667 SHA256 9ba9f278da011a3522b1bb8973b501116f123480af5572fb7162faf3cecc0274 SHA512 b661eee1eb5c9baf2404f9b7c215f751f66b362550c8b920578b6dc696e112ab244aa25081178456104076c3289b17b3e4c7d128c638767acfae9e06f0e0c932 WHIRLPOOL 01f23285b706709d6a3571bd63a28aaa744ccb149f370a76b56f80eaa0b0c8392f914422633f9324f240e8aa2a6be360834d16430af942388d985aa88737cfeb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSsEjyAAoJEJOE+m71LUu6up0QAJ6LzQ6g5iQUmQgA2ZoSJr6D
-vltAYbd4eSzDFXAflpiLv8w5s8mjqTkE8le7xtuH5JSINJ1Txo/0JWOaXnWfGhXz
-OfzVrfFozhn17Pj2Av88K7Mn+FFdaDQZjMNjgSaS9aBG0TzMGQjCRS2qpS6AhSxj
-9BLeY+eCgoa5Ta5R93BUyR26alxv6bK3y3uJNvo0fiqPEmPMWmf3X/3CLKfO40+3
-BhMhhukPfaUlg/y4IqS3dGEeTfBpwe9q5Oa9zkDkajKppi88AaJpvZK3r0N0Ff3o
-+ldN9N5CqcB8SPeT4sVpU07uz6nyUei+BfPcZWWJ3gWc0tbiwIUpKKRe7ATot29i
-ECOsxpiUi8ZFM/fa/kZnBXlNTxo9RoQOHr0SYOVZyauPRFXqdIUkNF7cmTLEbOph
-h+ZJiC8pWrXOGoWm9uKolZ+pv3DA43V0cAZvIjiGc1vwwjQrI8rBJzFhri35IX8i
-bpNxXrGM3YhHr9Qp6DPtEs8jG71vp77IxRUPEF5KhbmgIEEbsWk6ZGKnQhooHFzC
-Ku31rjpxHfjKCMmKiCEyhUnrGtIbDjDdL3b3MDlx7+osnQr+h7dwSNUHoAQJtc9j
-b7QRqRkWDBRQ9A4GJAKel62LlrGzfnuTnZeP035RK4dD3ADE9ROndoGLzxChBc2v
-E2yrlZoR9T8+O+kMZ01Z
-=IX+e
+iQIcBAEBCAAGBQJS2ogHAAoJEJOE+m71LUu6V10P/12ix4khhq2ReY8MijNpuYaH
+rm6yhQNnxn++xbANEFtlxUZzMILbkT0bvBJ9ocYJLvjXRcrMcpGkjl50L1Y24IGM
+/wazIKofAvhzPwaq6YQrzBQHbVs1VfFLl11HatYLyZP4zy6mz/b2IINfFDrlbjlK
+PnWRNzhLlSuh7+mFr5JxhDtkiB4FE71soqNHYFYsY92+FqI6o1/S5ZjbBn3glCvn
+h/ehYSUMo6mIq60MFf8QjYh0oiAsIZiF5e6q0d1SWDw+On3MpsbwIY6Wkq0crs3G
+e1++jQ96OQ8BBr6SK72VUlDFl2WdzF6Xov6NsrHX6LjE39utDEj90IFZiP2Ka2nw
+rKaBvyU839BPNinnFjwphi0yaKdxrwEqNCkOpAiG8e/Hsl52ELFqewhlSNug8jUY
++En1XsJZ8Tp2T8hIDMTK56x4dkGh/LA0HRVZJzqO9wAURFbKLTFOOXde65liETCm
+56JADFDGCms8SvwW9un7+WbZvS5KWd4fYYxW8QE915sZr8IcYsGsRgDyxW4sRHAe
+tkEOcGw756X4rDzrDnxixkUamEkvw/6qVY5eu3QSJ1/Mhp6CU9+kB41ierGdDFjI
+bx0UApwWqUUbWeKO9aBlxfptFGPyhFegOhb1oBqF+0akhDq6ijrL2nge/4pNA+Cl
+lktCmbb0+UZ8DqNxiwWY
+=wMg4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/electrum/electrum-1.9.6.ebuild b/net-misc/electrum/electrum-1.9.7.ebuild
index 1bafdb8d19df..f9726f640327 100644
--- a/net-misc/electrum/electrum-1.9.6.ebuild
+++ b/net-misc/electrum/electrum-1.9.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.9.6.ebuild,v 1.1 2013/12/17 12:50:09 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.9.7.ebuild,v 1.1 2014/01/18 13:55:28 blueness Exp $
 
 EAPI="5"
 
@@ -16,9 +16,12 @@ SRC_URI="http://download.electrum.org/download/${MY_P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-LINGUAS="ar_SA de_DE es_ES hu_HU it_IT ky_KG nl_NL pt_BR ru_RU ta_IN zh_CN
-		 cs_CZ eo_UY fr_FR id_ID ja_JP lv_LV pl_PL pt_PT sl_SI vi_VN"
-IUSE="gtk qt4"
+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 sl_SI
+		 ta_IN th_TH vi_VN zh_CN"
+
+IUSE="gtk qrcode +qt4 webkit"
 
 for lingua in ${LINGUAS}; do
 		IUSE+=" linguas_${lingua}"
@@ -29,7 +32,11 @@ RDEPEND="
 	>=dev-python/ecdsa-0.9
 	dev-python/slowaes
 	gtk? ( dev-python/pygtk:2 )
-	qt4? ( dev-python/PyQt4 )"
+	qrcode? ( media-gfx/zbar[python] )
+	qt4? (
+		 webkit? ( dev-python/PyQt4[webkit] )
+		 dev-python/PyQt4
+		 )"
 
 S=${WORKDIR}/${MY_P}
 
@@ -67,6 +74,14 @@ src_prepare() {
 		fi
 	fi
 
+	if use !webkit; then
+		sed -i "/'electrum_plugins.coinbase_buyback/d" setup.py || die
+	fi
+
+	if use !qrcode; then
+		sed -i "/'electrum_plugins.qrscanner/d" setup.py || die
+	fi
+
 	distutils-r1_src_prepare
 }
 
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index f8737b738a85..9a0abf718e35 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -14,4 +14,11 @@
 		<email>maksverver@geocities.com</email>
 		<name>Maks Verver</name>
 	</maintainer>
+	<maintainer>
+		<email>emery@vfemail.net</email>
+		<name>Emery Hemingway</name>
+	</maintainer>
+	<use>
+		<flag name='qrcode'>Enable QR code scanning with <pkg>media-gfx/zbar/</pkg></flag>
+	</use>
 </pkgmetadata>