Version bump, remove older broken 1.9.x

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

6 files changed, 77 insertions, 139 deletions

diff --git a/net-misc/electrum/ChangeLog b/net-misc/electrum/ChangeLog
index 0cebe517f023..2c63f7650840 100644
--- a/net-misc/electrum/ChangeLog
+++ b/net-misc/electrum/ChangeLog
@@ -1,6 +1,13 @@
 # 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.17 2013/11/13 12:54:16 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/ChangeLog,v 1.18 2013/12/17 12:50:09 blueness Exp $
+
+*electrum-1.9.6 (17 Dec 2013)
+
+  17 Dec 2013; Anthony G. Basile <blueness@gentoo.org> +electrum-1.9.6.ebuild,
+  +files/electrum.desktop-1.9.6.patch, +files/setup.py-1.9.6.patch,
+  -electrum-1.9.3.ebuild, -electrum-1.9.4.ebuild:
+  Version bump, remove older broken 1.9.x
 
 *electrum-1.9.4 (13 Nov 2013)
 
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 6459f462f3f7..9ab3882e890b 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,30 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX electrum.desktop-1.9.6.patch 291 SHA256 e14ccbeea2adefbc90a4d69b850ea82f8c627cadecba2a1dc2d675c075f2102e SHA512 386327ba6e0fec429e290b1bf8bb7775760a3bc7e0f7f03e037f370a3414e84c6f720f6432ea92f30a19007d1e02f9fcde8efb7f2327eaf6e5fe1f6dd06bb6df WHIRLPOOL 42386174e556c19b0618a0a8f6186aabcf0d67bf7fed55c80a63bee24bf03704d925497edc8de4a8389d9c5c6c85d9091ea01b01649853746332386097052915
+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.3.tar.gz 667528 SHA256 9388487ce2558227d952653cdba9e3fff43c5be0910edfb453306cddb95fd9b4 SHA512 f9ac7175177497c74fd19d0e8852e063f5e504e5f080041f757823f4fd1981dca42c8c8cf5af67b64de763ba5622fc2dcb6ce2e5dc3881ecc2b4ca66f45381f0 WHIRLPOOL eccce50800ae3cbd81f716391fa3cad72b7b1ab653b62e38a30179c98969b3b7cb0564cf5a6b562de40aca9c52810752abef54198bb77638e7d72ccf7948ff69
-DIST Electrum-1.9.4.tar.gz 685535 SHA256 e5bb1e5b4ca8b42513d2d21d83c95c6c03660d2b99b5c59caa60f0fb4aac9472 SHA512 38f87787dfc1f8b859aca7e276b749fe23870684728e40f76d4e8520fa639e0cced4176800d98f03cd647541a14311242067ac36ac11ec2744aa14906cbef83f WHIRLPOOL 10effb56bfe2b251f4135c45132b054e781be6eec22283de2c8d8d0332dee7d8afcd26bd72497b2fe7131cddf933d2195b3770f7df92f82f1213310ec32a22e3
+DIST Electrum-1.9.6.tar.gz 742261 SHA256 e54186b83472da83843fceef8d174e1198647cfc427c958ccc6fd3451c2a8132 SHA512 83b255e5efd72334434ebf97ffd7f7bc694ba0fd89dd5a82484d1e20efed6b4bdaf63353b638df5c00c7cc6d8eee83ac5ed6550a93672fcfa12bc39910a5b261 WHIRLPOOL df9ae38932eaeeece27b7529b954613b67638b8575d0a5218700eede8a2ae048d5d6d0989be16fbcfbf8baa09f0c00dab924b731a98b55a2ecb6173ba9b425b0
 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.3.ebuild 1853 SHA256 a6a0498a27bc2139d10dd421fd6a5848a882d934f97ef9342decaf15e8edf46f SHA512 5ddaadb5d00ac6fdf251fecc204e5763a90ed794d3cc159abc8a070721b7c761c64455e23b6fe34538da18c95f81ad29e94f71022693478bb1b17b3298eb2558 WHIRLPOOL 56e70679fb78e84af0ee04b623a5baf3d0f0fcb427e86e233c23f12759d456e5b751b44ce99f39ca7251eb3c6edf5f0f972f13f6f6f5124685509eb2b6473859
-EBUILD electrum-1.9.4.ebuild 1853 SHA256 7a7e79a94950d50ed6eda4f7ed3bea865a01a0d765d84b0bba8acaef3747a7c0 SHA512 b5fd04f299663f00255db8ebbb3c51d4ad0a4a7b68d8ed8b5bcc49fd08af1385b205be2928b6ffe8fd456104c05640631c4d54730764ba75d1f4ffea662d8452 WHIRLPOOL f0cb8b0015172743eff7bc6366fe52c0fb19365a7a90f34abe1fab3f5d0aac3a3ca9d1935ec7f362ed097a8810173de27d30b3230c1b6c2146a844c2778c00e5
-MISC ChangeLog 2460 SHA256 4a826568a76031585ffc4ec7f4d59cd366656a2ca961c5c1031bced10b551920 SHA512 eae8fc4d5834363c5874a483825fb05dd8e0b98ee88107e89db82c56bbac7d0cd50f523516f2b5a163e2456573e04dd81b14a7848ec4a5cb49786e248815eca5 WHIRLPOOL ea50a38d1f6b43cde7ccf7f29165057bdf05799259c55ea9e95b7fefe74335733a4fc6c190c7e5dfbbed719d89285bb3593dd940da6accf12db9d50979be7960
+EBUILD electrum-1.9.6.ebuild 1996 SHA256 9329fcb74d4cb72d1e8bdab46f4c07965717db7fc99d4f12f5054089740f460b SHA512 7951b8c7bacbafcf24cafae29edb764855802165e61b06b68262d2769c272214c5394561b21b89306c9aac437a16335b91b30b537ad7a6a9d5d32525fad3e352 WHIRLPOOL 7ad633334d9034fbd90085d24976e72eda1bdd13ffb069b51eea51677136163d365eab06dc0789cef5dce7a844ad2d7c6e57ca695b7f1033affb66a467d55726
+MISC ChangeLog 2731 SHA256 af68e408a057581e738b89efab36c8fac3fab78655e2ccc9818e7aab51bc6e0a SHA512 59ebb3c4a34480e7f08229683b4c784271c550d6805d2d39aeea26774e172bfb648350aaf1ce2ce87b852d06d5fc782bc7e2da15adc8246d1d231311e07d5953 WHIRLPOOL 6dac9282f67db05df3cfbab94572528c9e91cda6a91ba48f7543464395f53d281fe73c789344550b608b5c6a6b5152e77496890ffc7f5240eb2c0f293e975ff5
 MISC metadata.xml 472 SHA256 e97c20e859b288822e281765af714b85c70d48e4c84c2925e66a36182d1eb10d SHA512 1a77af9adfde40ba53f17f85a3e2c172a161ee01c81ea9d7ae02aa6764b4f03e24c48b3f39eb91d60369246801f3a2b8027640cb7b89a1afe9e5c43078dc9b58 WHIRLPOOL cf7b85cc0b0ed5d881fdacdf60730c41e09a7a462ece923dc81cf8c4aa0ef575f9d5eeac9897d5ae71159dd32541f91d3c0f2ddcac789fda36851b0ac97c8a88
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJSg3aaAAoJEJOE+m71LUu6XXUQAJmA3dTLLKM/fXzNbjWVkQgf
-VnOnKhpXFVc1h6I4mBOTF466mCR2IHWk0n30Ud/IiHl++2AjzFKyqX7vBlVR5F4c
-zjI2XXuuQnwJbWIOvT+ALDGqz6EW0Ox3RxIJDB0mm+2QXs8S9yYwta0jyn9IyhFC
-xsshmDPHW3klxqaxD5rGFxy4PWHvCne6MMxj27LskROvjs8Uq4DNwhBmnD/vmVUy
-hG6fROcvCriydxhyuucwiEazVUTD48qv/ZUah7ZFGpwhBaxMDFom8R1oEefaHNul
-hwNNCWw69umvcUduWkgSpYmf1cQ4d699mqMJLkLVd4Ue85wT8HOMw4lwjWp5eG9E
-414OiKjYbGixbX8rzedzODtKWjlsZYOBMWp2IE8HodKtqp6bNlRK42pGh2qogDxw
-7GxHPsuPeAyuYp/+dFxCVxEe5vRiM/5jAWPbIZocdzqwV+vnJxKbLgZRfapLR+x4
-gIJjSOJuQROnB8duTYAM/3g2AS6GZucXGdl04yecwsncdC5yLmulGgs9sygOfEmP
-LnGDDD3KxMx6zjFBOIMafKmzZCa3KQsiSx0zBsg+H2GRwGnvhrodZli3MdRm39F+
-HZppikxrNqyhPg98RPwBVgrjoRKXR3wqgCIU66eOBESJcaKInM8/uk8P3geC4hw+
-pUKRp0A2kdbugoXIRJdb
-=5JRA
------END PGP SIGNATURE-----
diff --git a/net-misc/electrum/electrum-1.9.4.ebuild b/net-misc/electrum/electrum-1.9.4.ebuild
deleted file mode 100644
index b98bf07541a6..000000000000
--- a/net-misc/electrum/electrum-1.9.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.9.4.ebuild,v 1.1 2013/11/13 12:54:16 blueness Exp $
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-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"
-IUSE="gtk qt4"
-REQUIRED_USE="|| ( gtk qt4 )"
-
-LANGS="br cs de eo es fr it lv nl ru sl vi zh"
-
-for X in ${LANGS}; do
-	IUSE+=" linguas_${X}"
-done
-unset X
-
-RDEPEND="
-	dev-python/setuptools
-	dev-python/ecdsa
-	dev-python/slowaes
-	gtk? ( dev-python/pygtk:2 )
-	qt4? ( dev-python/PyQt4 )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	# Prevent icon from being installed in the wrong location:
-	sed -i '/electrum\.png/ d' setup.py || die
-	sed -i "s:^Icon=.*:Icon=${PN}:" "${PN}.desktop" || die
-
-	# Fix .desktop to pass validation
-	sed -i 's:bitcoin$:bitcoin;:' electrum.desktop || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${LANGS#en}; 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:
-	if use !gtk; then
-		rm gui/gtk.py || die
-		sed -i "/electrum_gui.gtk/d" setup.py
-	fi
-	if use !qt4; then
-		rm -rf gui/qt || die
-		sed -i "/electrum_gui.qt/d" setup.py
-		sed -i "/config.get('gui','classic')/s/classic/gtk/" electrum \
-			|| die
-	fi
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 64 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-1.9.3.ebuild b/net-misc/electrum/electrum-1.9.6.ebuild
index aa3f55ab160e..1bafdb8d19df 100644
--- a/net-misc/electrum/electrum-1.9.3.ebuild
+++ b/net-misc/electrum/electrum-1.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.9.3.ebuild,v 1.1 2013/11/12 14:59:11 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/electrum/electrum-1.9.6.ebuild,v 1.1 2013/12/17 12:50:09 blueness Exp $
 
 EAPI="5"
 
@@ -16,19 +16,17 @@ 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"
-REQUIRED_USE="|| ( gtk qt4 )"
 
-LANGS="br cs de eo es fr it lv nl ru sl vi zh"
-
-for X in ${LANGS}; do
-	IUSE+=" linguas_${X}"
+for lingua in ${LINGUAS}; do
+		IUSE+=" linguas_${lingua}"
 done
-unset X
 
 RDEPEND="
 	dev-python/setuptools
-	dev-python/ecdsa
+	>=dev-python/ecdsa-0.9
 	dev-python/slowaes
 	gtk? ( dev-python/pygtk:2 )
 	qt4? ( dev-python/PyQt4 )"
@@ -38,40 +36,42 @@ S=${WORKDIR}/${MY_P}
 DOCS="RELEASE-NOTES"
 
 src_prepare() {
-	# Prevent icon from being installed in the wrong location:
-	sed -i '/electrum\.png/ d' setup.py || die
-	sed -i "s:^Icon=.*:Icon=${PN}:" "${PN}.desktop" || die
+	# Prevent .desktop, icon, and translations from being installed in the wrong locations
+	epatch "${FILESDIR}"/setup.py-${PV}.patch
 
-	# Fix .desktop to pass validation
-	sed -i 's:bitcoin$:bitcoin;:' electrum.desktop || die
+	epatch "${FILESDIR}"/electrum.desktop-${PV}.patch
+	validate_desktop_entries
 
 	# Remove unrequested localization files:
-	local lang
-	for lang in ${LANGS#en}; do
-		if use linguas_$lang; then
-			test -f "locale/$lang/LC_MESSAGES/${PN}.mo" || die
+	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
+			rm -r "locale/${lang}" || die
 		fi
 	done
 
 	# Remove unrequested GUI implementations:
 	if use !gtk; then
-		rm gui/gtk.py || die
-		sed -i "/electrum_gui.gtk/d" setup.py
+		sed -i "/'electrum_gui.gtk/d" setup.py || die
+	fi
+	if use !qt4; then
+		sed -i "/'electrum_gui.qt/d" setup.py  || die
 	fi
+
 	if use !qt4; then
-		rm -rf gui/qt || die
-		sed -i "/electrum_gui.qt/d" setup.py
-		sed -i "/config.get('gui','classic')/s/classic/gtk/" electrum \
-			|| die
+		if use gtk; then
+			sed -i "s/config.get('gui','classic')/ config.get('gui','gtk')/" electrum || die
+		else
+			sed -i "s/config.get('gui','classic')/ config.get('gui','text')/" electrum || die
+		fi
 	fi
 
 	distutils-r1_src_prepare
 }
 
 src_install() {
-	doicon -s 64 icons/${PN}.png
+	doicon -s 128 icons/${PN}.png
 	distutils-r1_src_install
 }
 
diff --git a/net-misc/electrum/files/electrum.desktop-1.9.6.patch b/net-misc/electrum/files/electrum.desktop-1.9.6.patch
new file mode 100644
index 000000000000..89f576c3f39c
--- /dev/null
+++ b/net-misc/electrum/files/electrum.desktop-1.9.6.patch
@@ -0,0 +1,11 @@
+diff --git a/electrum.desktop b/electrum.desktop
+index 1b0c5ab..20a0b1e 100644
+--- a/electrum.desktop
++++ b/electrum.desktop
+@@ -13,5 +13,5 @@ Categories=Network;
+ StartupNotify=false
+ Terminal=false
+ Type=Application
+-MimeType=x-scheme-handler/bitcoin
++MimeType=x-scheme-handler/bitcoin;
+ 
diff --git a/net-misc/electrum/files/setup.py-1.9.6.patch b/net-misc/electrum/files/setup.py-1.9.6.patch
new file mode 100644
index 000000000000..ee89641775d6
--- /dev/null
+++ b/net-misc/electrum/files/setup.py-1.9.6.patch
@@ -0,0 +1,28 @@
+diff --git a/setup.py b/setup.py
+index c2eba94..1e032d7 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,15 +16,12 @@ if sys.version_info[:3] < (2, 6, 0):
+     sys.exit("Error: Electrum requires Python version >= 2.6.0...")
+ 
+ usr_share = '/usr/share'
+-if not os.access(usr_share, os.W_OK):
+-    usr_share = os.getenv("XDG_DATA_HOME", os.path.join(os.getenv("HOME"), ".local", "share"))
+ 
+ data_files = []
+ if (len(sys.argv) > 1 and (sys.argv[1] == "sdist")) or (platform.system() != 'Windows' and platform.system() != 'Darwin'):
+     print "Including all files"
+     data_files += [
+         (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
+-        (os.path.join(usr_share, 'app-install', 'icons/'), ['icons/electrum.png'])
+     ]
+     if not os.path.exists('locale'):
+         os.mkdir('locale')
+@@ -37,7 +34,6 @@ if not os.access(appdata_dir, os.W_OK):
+     appdata_dir = os.path.join(usr_share, "electrum")
+ 
+ data_files += [
+-    (appdata_dir, ["data/README"]),
+     (os.path.join(appdata_dir, "cleanlook"), [
+         "data/cleanlook/name.cfg",
+         "data/cleanlook/style.css"