Version bump.

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

4 files changed, 187 insertions, 17 deletions

diff --git a/net-misc/electrum/ChangeLog b/net-misc/electrum/ChangeLog
index 429ca8b05594..8df2b0876e26 100644
--- 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.26 2015/03/01 13:42:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/ChangeLog,v 1.27 2015/03/03 00:06:28 blueness Exp $
+
+*electrum-2.0.0 (03 Mar 2015)
+
+  03 Mar 2015; Anthony G. Basile <blueness@gentoo.org> +electrum-2.0.0.ebuild,
+  metadata.xml:
+  Version bump.
 
 *electrum-1.9.8-r1 (01 Mar 2015)
 
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 8d109184bd4d..d357e3d1bb13 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -8,27 +8,29 @@ DIST Electrum-1.7.4.tar.gz 493103 SHA256 588ae22a1682e0be7e4f695777d36ee011a2b11
 DIST Electrum-1.8.1.tar.gz 516341 SHA256 16746e35f2847feb8803aa9b34184ce79d3df88e0ea222a4e602e3b3830ec834 SHA512 0cd345c8ba8e66ab2094a569109029d4f402854da2135acf06ee07d086ac14cd1134c5a5dcaa432fabc31bccfd86782a29dc32465543f03054c0a8c9aeb5feee WHIRLPOOL 9485ade5124b253edbb562ccc6d7a6b7570bcada3e3063db2afdc568517d82aec9495eae4992e83b19fbc7f6205b7378fc237efb7c093be0b23c53baa1e05146
 DIST Electrum-1.9.7.tar.gz 751357 SHA256 8d4cad6338982a515968425e95f14204ab2ed617867dbeef6b05bf8b46ffc659 SHA512 40e12524e1604ab067a6ce2c5c540c553520ed69da03a38da10d9c075b68c693986eb49dc558250a3e461dd310e10c0d65d22a5cbfaf8d7a2e9de48eb75fdf03 WHIRLPOOL d2147ff2b534a369846804c002f8c60f76afbb8dca1fb22e02f0a98770e2a05ebc0814ea8c99f51f3d83f09ef5c32432813e41b275158b5281386f6a67edf4b8
 DIST Electrum-1.9.8.tar.gz 860858 SHA256 8fc144a32013e4a747fea27fff981762a6b9e14cde9ffb405c4c721975d846ff SHA512 b18d0c301efac00b63c0b90a5d7764f02baaefddaf060b5c9b57b38dbd625cc9ac9cd6219b387930ca6da7e63d160e48cd34dc755cdf8eb48478bf327d6839e5 WHIRLPOOL 989f6efd2af8b14ef8e0b76cf687c90c9352bedcdcb9ae99110df2c8ead46078bcf6dc4e7c98b8dfe19eaae08caf05352b7be4cf1b85da6fade396c7816163f0
+DIST Electrum-2.0.tar.gz 1760060 SHA256 69942f9edf4067e4a9b6cb66e7a5ae17215bab295f83647999656f847481bdcf SHA512 4e64750995ae977e3346647b68fe298e88a1c7bf269b1a31575b881a4eb8aa766df11feb0b6c98151e10f783f6f2a57080815ff34b5a9ec62c732c5c2e25d3f6 WHIRLPOOL 944fa097fc2e43560e3eae7d94e9b7f9b367d418221a9afb873adf420e178e2024060f91277829613ec11e35553c5efe4f96b07309f331441e05b7be8e5ea1aa
 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 3997 SHA256 b5bc496a8b2206e1ef0e2b9fae55967b1257a068bf11e016d83e3896822cdb99 SHA512 2bdbbce0b99537bec9b71957d8d577bcdd6adb56592d272524d06f83d15b15701f4851427bb04be525779488c66cf8346db59f3b2de5ba3fd4837e1d30ae3bcc WHIRLPOOL a0ceb4901bdef24eb777970f922d6cdb430dc3343fdfdc5f39de6d8b1463757bd94b755c888a1e064f04b0c7577b652506e25e7f9bc0b2935323881c42e28de4
-MISC metadata.xml 1231 SHA256 883cdc18373e7f92783b96e6017a8e79bdb6b99a10a69bf001afb3637ff38eeb SHA512 c15f178f4c22f7bd5db0181f0042970f865856579ef72022204639f498f73461a36b52e511f9f7212b6a2f5ad7a86bd70e2cfa70382a7bd9c919efcd31c3a1ce WHIRLPOOL a21ea01ae8ba69391ae4cdf4ad6e54cae4fd75dfa1da16f8a05a38cd6a621b24e1472f17287f3a5003b6af3a0ccdc6e7803bf0d3779cbcc2e1d8269abe610ae3
+EBUILD electrum-2.0.0.ebuild 4269 SHA256 a3bace52766d49e823f445406aeae394f0dd9563dea68dde43063b4859a26ba8 SHA512 52feff631209d566f46b72419aa3917257682e4266c8364879732fe5d35377098fecff0aebc70d0d853457a337d6cb121ffad65fcc30da2762a91929114873c9 WHIRLPOOL 209e1b6ef03a528b68de0afa932358fa96c179db4e937626df8172d2a9bad0986b1129f83a4d6cbfe28a39ac8f03d7b02431eb182f200340481150486eea840f
+MISC ChangeLog 4140 SHA256 3ca3ce50c5b435d9add5ebefbbcccedf4ae3048285e5acef4a771697b2102810 SHA512 121f0c6cb01ac92e09a2141d90c913f5c16b8b24ee50a263ecfd9349d7d64f5f8ab9c1de389f72042c2d042b87db4d9c7a460c592187846389dc995eaf081030 WHIRLPOOL 04816586a5e3cfb395a71ca866aed8d0119b84c7c1f7d67451bce11a6fdc942dbe67eb3ebd1cf894239428d677472882f5ecae4d839aa6ad0aac0bc24700457b
+MISC metadata.xml 1717 SHA256 e93333c823f03d96175fb231a295021c08ebed2d4f1074683f2c1e87aa56e37d SHA512 7ab573e98dbb34953bec3c9b02bbee1bad2b897d7819b2d09e3a6055c018662edf6b33e61ae8278a706c15109b44edb24daafe06f55d18d1ce58bb075a99a838 WHIRLPOOL fa5bf30b0cf6bf843bc3ea604f97bd4bc536f459a5da73e7defb773887919dbd57f3d3c8ac190790d475e08ff7acdfde7efeacc4fdac8ab788a907fcbf0c8db5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-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
+iQIcBAEBCAAGBQJU9PucAAoJEJOE+m71LUu6UdQP/jlSVaNXUJy/A2HqAmRRuFc8
+3SB87tCIFJ/hNLnJ9TGwbtuqD3cxd4jfPxOp2tOfacMozc5jQ/yr8XM/znhK+hMy
+rPsVM7VH3zuedQStCQdXtMIbHJ8/3DyGt719qg5nxGdivK0pjWJ0UxYP5ptjK1R/
+eTuboyBGsTFy7eM3HzF9p7Ot9KeyVHFfftpG6c0mVHusd0k5/fUOu+Jg3tSeGQ0g
+vDtUiOGaWPGYLi+VpZKoGNAXzk4XvGpnmg1Z6FcjiRUi9XNucGNd15fzyzIqe96l
+EJv1hdNYzo/yyMKxFbGH61W2sS5BK25jguwE7yWLICJs45RebSCn7vcS724FYqXY
+DcGC6MCSiHKLWAdf0lTpF2VFrl1KMpLj/BhRZ238ERDNXZG856uJziy3YrFbPB0G
+NAqJhDG+jPhQy8eFwWvu5gu9XSD8NBKUwZZACWKSA7NvyYdARs5rssBDK7F783oK
+cSRX8uVLzjO1eZ/tNbTP+UuQYWBji50sQ5VefRyqSchTi60vkCIWPes9sHABuBBF
+m42Oa9IdL08l75q2gStgIqpnOJ5j9m4BWoowRwrqvTf33dgc2GNowLge7SK6Wxhi
+NNC9dUck2UDMe/MkrP0w/Ed3/0tcWxG0muiS95Aki9PPwAvMSYVocKkZPh0Z9QzI
+n55oFDfmVD7j0cBI3dgt
+=ja+B
 -----END PGP SIGNATURE-----
diff --git a/net-misc/electrum/electrum-2.0.0.ebuild b/net-misc/electrum/electrum-2.0.0.ebuild
new file mode 100644
index 000000000000..204a33977e19
--- /dev/null
+++ b/net-misc/electrum/electrum-2.0.0.ebuild
@@ -0,0 +1,157 @@
+# 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-2.0.0.ebuild,v 1.1 2015/03/03 00:06:28 blueness Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses="
+
+inherit eutils distutils-r1 gnome2-utils
+
+MY_P=Electrum-2.0
+DESCRIPTION="User friendly Bitcoin client"
+HOMEPAGE="https://electrum.org/"
+SRC_URI="https://electrum.org/download/${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="aliases amodem cli coinbase_com cosign +fiat graph 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 )
+	aliases? ( qt4 )
+	amodem? ( qt4 )
+	coinbase_com? ( qt4 )
+	cosign? ( qt4 )
+	fiat? ( qt4 )
+	graph? ( 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/socksipy[${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? (
+		coinbase_com? ( dev-python/PyQt4[${PYTHON_USEDEP},webkit] )
+		dev-python/PyQt4[${PYTHON_USEDEP}]
+	)
+	ncurses? ( dev-lang/python )
+	aliases? ( dev-python/dnspython[${PYTHON_USEDEP}] )
+	amodem? ( dev-python/amodem[${PYTHON_USEDEP}] )
+	graph? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+"
+
+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 aliases       '' openalias       )  \
+		$(usex amodem        '' audio           )  \
+		btchipwallet  \
+		$(usex coinbase_com  '' coinbase_buyback)  \
+		$(usex cosign        '' cosigner_pool   )  \
+		$(usex fiat          '' exchange_rate   )  \
+		$(usex graph         '' plot            )  \
+		$(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/metadata.xml b/net-misc/electrum/metadata.xml
index 5de1fa13ba21..8440e8e0a1d5 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -20,13 +20,18 @@
 	</maintainer>
 	<use>
 		<flag name='aliases'>Enable plugin for looking up aliases</flag>
+		<flag name='amodem'>Enable plugin for air-gapped transaction signing using <pkg>dev-python/amodem</pkg></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='cosign'>Enable plugin to support multisig wallets between multiple Electrum clients</flag>
 		<flag name='fiat'>Enable plugin for looking up fiat values of bitcoin</flag>
+		<flag name='graph'>Enable plugin to generate transaction graphs</flag>
+		<flag name='greenaddress_it'>Enable plugin to verify GreenAddress.it instant transactions</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='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='trustedcoin_com'>Enable plugin to use two-factor service by TrustedCoin.com</flag>
 		<flag name='vkb'>Enable plugin for virtual keyboard</flag>
 	</use>
 </pkgmetadata>